Georg/teddit
1
0
Fork 0
mirror of https://codeberg.org/tacerus/teddit.git synced 2025-01-10 05:12:32 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into changelog

Browse Source
This commit is contained in:
random_guy52 2021-01-11 07:27:30 +01:00
commit 8bfc37fd05
3 changed files with 678 additions and 673 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/compilePostComments.js
View File

@ -35,7 +35,7 @@ module.exports = function() {
ups = `${kFormatter(comments.ups)} points` ups = `${kFormatter(comments.ups)} points`
} }
if(comments.edited) { if(comments.edited) {
edited_span = `<span title="this comment is edited">*</span>` edited_span = `<span title="last edited ${toUTCString(comments.edited)}">*</span>`
} }
if(comments.controversiality > 0) { if(comments.controversiality > 0) {
controversial_span = `<span class="controversial" title="this comment is voted as controversial">†</span>` controversial_span = `<span class="controversial" title="this comment is voted as controversial">†</span>`
@ -131,7 +131,7 @@ module.exports = function() {
ups = `${kFormatter(comment.ups)} points` ups = `${kFormatter(comment.ups)} points`
} }
if(comment.edited) { if(comment.edited) {
edited_span = `<span title="this comment is edited">*</span>` edited_span = `<span title="last edited ${toUTCString(comments.edited)}">*</span>`
} }
if(comment.controversiality > 0) { if(comment.controversiality > 0) {
controversial_span = `<span class="controversial" title="this comment is voted as controversial">†</span>` controversial_span = `<span class="controversial" title="this comment is voted as controversial">†</span>`

17
static/css/styles.css
View File

@ -2,7 +2,8 @@
--sm-font: 0.666rem; --sm-font: 0.666rem;
--lightgray: #f5f5f5; --lightgray: #f5f5f5;
--whitebg: #ffffff; --whitebg: #ffffff;
--linkcolor: #000bac; --linkcolor: #0645ad;
--lightlinkcolor: #406bb3;
--graytext: #6f6f6f; --graytext: #6f6f6f;
} }
* { * {
@ -382,7 +383,7 @@ footer a {
#links .link .entry .title a h2 { #links .link .entry .title a h2 {
display: initial; display: initial;
font-size: 16px; font-size: 16px;
color: #0000ff; color: var(--linkcolor);
font-size: medium; font-size: medium;
font-weight: normal; font-weight: normal;
} }
@ -397,7 +398,7 @@ footer a {
margin-top: 2px; margin-top: 2px;
} }
#links .link .entry .meta a { #links .link .entry .meta a {
color: #737373; color: var(--lightlinkcolor);
padding-left: 3px; padding-left: 3px;
padding-right: 3px; padding-right: 3px;
} }
@ -1094,7 +1095,7 @@ a.sub-to-subreddit.gray {
color:#4f4f4f; color:#4f4f4f;
} }
.md a { .md a {
color:#0079d3; color: var(--linkcolor);
text-decoration:none; text-decoration:none;
} }
.md a del { .md a del {
@ -1376,6 +1377,9 @@ code {
margin-left: 20px; margin-left: 20px;
margin-top: 30px; margin-top: 30px;
} }
#search.sr {
margin-top: 30px;
}
#links.sr { #links.sr {
width: calc(100% - 10px); width: calc(100% - 10px);
} }
@ -1424,6 +1428,7 @@ code {
#post .crosspost { #post .crosspost {
margin: auto 2.5%; margin: auto 2.5%;
} }
a.sub-to-subreddit {
padding: 8px 10px 8px 10px;
}
} }

2
views/subreddit.pug
View File

@ -150,7 +150,7 @@ html
input(type="checkbox", name="nsfw", id="nsfw", checked="checked") input(type="checkbox", name="nsfw", id="nsfw", checked="checked")
input(type="submit", value="search") input(type="submit", value="search")
if subreddit_about if subreddit_about
.subscribe .subscribe.content
- -
let subbed_to_this_subreddit = false let subbed_to_this_subreddit = false
let subbed = [] let subbed = []