Merge branch 'main' into changelog

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

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>`

File diff suppressed because it is too large Load Diff

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 = []