Georg/teddit
1
0
Fork 0
mirror of https://codeberg.org/tacerus/teddit.git synced 2025-01-24 19:44:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into changelog

Browse Source
This commit is contained in:
random_guy52 2021-01-22 18:44:54 +01:00
commit c24936af15
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/commons.js
View File

@ -152,7 +152,7 @@ module.exports = function(request, fs) {
let str = s.replace(re, (m) => { let str = s.replace(re, (m) => {
return unescaped[m] return unescaped[m]
}) })
let r = new RegExp('((www|old)\.)?reddit.com', 'g') let r = new RegExp('((www|old)\.)?reddit[.]com', 'g')
let result = str.replace(r, config.domain) let result = str.replace(r, config.domain)
return result return result
} else { } else {

2
routes.js
View File

@ -854,7 +854,7 @@ module.exports = (app, redis, fetch, RedditAPI) => {
}) })
}) })
app.get('/r/:subreddit/comments/:id/:snippet/:comment_id?', (req, res, next) => { app.get('/r/:subreddit/comments/:id/:snippet?/:comment_id?', (req, res, next) => {
let subreddit = req.params.subreddit let subreddit = req.params.subreddit
let id = req.params.id let id = req.params.id
let snippet = encodeURIComponent(req.params.snippet) let snippet = encodeURIComponent(req.params.snippet)

26
static/css/sepia.css
View File

@ -1,7 +1,7 @@
:root { :root {
--bodybg: #ccc9b8; /* #cac5ad; */ --bodybg: #ccc9b8; /* #cac5ad; */
--bodytext: #53524b; --bodytext: #53524b;
--topbarbg: #992c09; --endsbg: #992c09;
--headerbg: #bf360c; --headerbg: #bf360c;
--headertext: white; --headertext: white;
--headerfaded: #ecc3b7; --headerfaded: #ecc3b7;
@ -10,6 +10,7 @@
--shadow: #9e9e9e; --shadow: #9e9e9e;
--buttonbg: #f2f0ea; --buttonbg: #f2f0ea;
--buttontext: #53524b; --buttontext: #53524b;
--infobarbg: #ebe6b6;
--oddbg: #e2dfd7; --oddbg: #e2dfd7;
--oddborder: #616161; --oddborder: #616161;
--evenbg: #f2f0ea; --evenbg: #f2f0ea;
@ -28,7 +29,7 @@ body.sepia {
color: var(--bodytext); color: var(--bodytext);
} }
body.sepia nav { body.sepia nav {
background: var(--topbarbg); background: var(--endsbg);
color: var(--headertext); color: var(--headertext);
} }
body.sepia .top-links { body.sepia .top-links {
@ -125,15 +126,22 @@ body.sepia input[type="checkbox"] {
margin-top: 6px; margin-top: 6px;
} }
body.sepia footer { body.sepia footer {
margin-top: 20px; margin-top: 16px;
padding: 8px 0 8px 20px; padding: 8px 0 8px 20px;
background: var(--endsbg);
box-shadow: 0 0 2px var(--shadow); box-shadow: 0 0 2px var(--shadow);
} }
body.sepia footer a {
color: var(--headerfaded);
}
/* Search */ /* Search */
body.sepia #links.search { body.sepia #links.search {
width: calc(100% - 40px); width: calc(100% - 40px);
} }
/* Comments */ /* Comments */
body.sepia #post header div a {
color: var(--headerfaded);
}
body.sepia #post .score { body.sepia #post .score {
color: var(--graytext); color: var(--graytext);
} }
@ -154,8 +162,10 @@ body.sepia #post .crosspost {
body.sepia #post .crosspost { body.sepia #post .crosspost {
padding: 0 16px 16px 0; padding: 0 16px 16px 0;
} }
body.sepia #post header div a { body.sepia .infobar {
color: var(--headerfaded); background: var(--infobarbg);
border-radius: 3px;
box-shadow: 0 0 2px var(--shadow);
} }
body.sepia .comment { body.sepia .comment {
background: var(--oddbg); background: var(--oddbg);
@ -210,7 +220,7 @@ body.sepia .comments > form button {
} }
@media only screen and (max-width: 600px) { @media only screen and (max-width: 600px) {
body.sepia #sidebar { body.sepia #sidebar {
width: 100%; width: 100%;
} }
} }