diff --git a/gulp/res/css/style.css b/gulp/res/css/style.css index 7b8ceb72..2aae6f5a 100644 --- a/gulp/res/css/style.css +++ b/gulp/res/css/style.css @@ -730,6 +730,11 @@ input:invalid, textarea:invalid { color:var(--capcode-color); } +.post-icons { + filter:var(--icon-color); + vertical-align: middle; +} + .post-tripcode, .post-name { color: var(--name-color); } @@ -1108,7 +1113,8 @@ are these (along with condensed flag image) originally from here? display: inline-block; width: 16px; height: 11px; - background:url(/img/flags.png) no-repeat + background:url(/img/flags.png) no-repeat; + image-rendering: crisp-edges; } .flag.flag-ad {background-position: -16px 0} diff --git a/gulp/res/css/themes/chaos.css b/gulp/res/css/themes/chaos.css index b4464915..a5dc1573 100644 --- a/gulp/res/css/themes/chaos.css +++ b/gulp/res/css/themes/chaos.css @@ -1,4 +1,5 @@ :root { + --icon-color:invert(17%)sepia(89%)saturate(7057%)hue-rotate(2deg)brightness(93%)contrast(120%); --alt-label-color:#001010; --alt-font-color:#00CCCC; --background-top:#000505; diff --git a/gulp/res/css/themes/choc.css b/gulp/res/css/themes/choc.css index 747ee60e..a72cdea3 100644 --- a/gulp/res/css/themes/choc.css +++ b/gulp/res/css/themes/choc.css @@ -1,5 +1,6 @@ /*tomorrow*/ :root { + --icon-color:invert(17%)sepia(89%)saturate(7057%)hue-rotate(2deg)brightness(93%)contrast(120%); --alt-label-color: #42200f; --alt-font-color: #ff7e83; --background-top: #2f1903; diff --git a/gulp/res/css/themes/gurochan.css b/gulp/res/css/themes/gurochan.css index b75b2965..bb52b265 100644 --- a/gulp/res/css/themes/gurochan.css +++ b/gulp/res/css/themes/gurochan.css @@ -1,5 +1,6 @@ /*gurochan*/ :root { + --icon-color:invert(17%)sepia(89%)saturate(7057%)hue-rotate(2deg)brightness(93%)contrast(120%); --alt-label-color: #e6cbc0; --alt-font-color: #000; --background-top: #EDDAD2; diff --git a/gulp/res/css/themes/lain.css b/gulp/res/css/themes/lain.css index af67f4fb..5db0d943 100644 --- a/gulp/res/css/themes/lain.css +++ b/gulp/res/css/themes/lain.css @@ -1,5 +1,6 @@ /*lainchan*/ :root { + --icon-color:invert(17%)sepia(89%)saturate(7057%)hue-rotate(2deg)brightness(93%)contrast(120%); --alt-label-color: #333; --alt-font-color: #bbb; --background-top: #1E1E1E; diff --git a/gulp/res/css/themes/makaba.css b/gulp/res/css/themes/makaba.css index aed8791b..3313b50d 100644 --- a/gulp/res/css/themes/makaba.css +++ b/gulp/res/css/themes/makaba.css @@ -1,5 +1,6 @@ /*makaba*/ :root { + --icon-color:invert(17%)sepia(89%)saturate(7057%)hue-rotate(2deg)brightness(93%)contrast(120%); --alt-label-color: #f5f5f5; --alt-font-color: #333; --background-top: #EEE; diff --git a/gulp/res/css/themes/navy.css b/gulp/res/css/themes/navy.css index 2449081a..cbbb1927 100644 --- a/gulp/res/css/themes/navy.css +++ b/gulp/res/css/themes/navy.css @@ -1,5 +1,6 @@ /*tomorrow*/ :root { + --icon-color:invert(17%)sepia(89%)saturate(7057%)hue-rotate(2deg)brightness(93%)contrast(120%); --alt-label-color: #1a1e34; --alt-font-color: #bfbfbf; --background-top: #080c19; diff --git a/gulp/res/css/themes/rei-zero.css b/gulp/res/css/themes/rei-zero.css index e64d19b6..9ec5e366 100644 --- a/gulp/res/css/themes/rei-zero.css +++ b/gulp/res/css/themes/rei-zero.css @@ -1,5 +1,6 @@ /*rei-zero*/ :root { + --icon-color:invert(17%)sepia(89%)saturate(7057%)hue-rotate(2deg)brightness(93%)contrast(120%); --alt-label-color: #29373e; --alt-font-color: #d6d6d6; --background-top: #000E1C; diff --git a/gulp/res/css/themes/sushi.css b/gulp/res/css/themes/sushi.css index e10f22fd..43d07eec 100644 --- a/gulp/res/css/themes/sushi.css +++ b/gulp/res/css/themes/sushi.css @@ -1,5 +1,6 @@ /*sushi*/ :root { + --icon-color:invert(17%)sepia(89%)saturate(7057%)hue-rotate(2deg)brightness(93%)contrast(120%); --alt-label-color: #B6DDDE; --alt-font-color: black; --background-top: #2e99cc70; diff --git a/gulp/res/css/themes/tomorrow.css b/gulp/res/css/themes/tomorrow.css index f9c4f968..988795d5 100644 --- a/gulp/res/css/themes/tomorrow.css +++ b/gulp/res/css/themes/tomorrow.css @@ -1,5 +1,6 @@ /*tomorrow*/ :root { + --icon-color:invert(17%)sepia(89%)saturate(7057%)hue-rotate(2deg)brightness(93%)contrast(120%); --alt-label-color: #282a2e; --alt-font-color: #c5c8c6; --background-top: #1d1f21; diff --git a/gulp/res/css/themes/tomorrow2.css b/gulp/res/css/themes/tomorrow2.css index 23b392d1..6d001793 100644 --- a/gulp/res/css/themes/tomorrow2.css +++ b/gulp/res/css/themes/tomorrow2.css @@ -1,5 +1,6 @@ /*tomorrow*/ :root { + --icon-color:invert(17%)sepia(89%)saturate(7057%)hue-rotate(2deg)brightness(93%)contrast(120%); --alt-label-color: #282a2e; --alt-font-color: #c5c8c6; --background-top: #1d1f21; diff --git a/gulp/res/css/themes/yotsuba b.css b/gulp/res/css/themes/yotsuba b.css index e23c2ed8..163a6d3f 100644 --- a/gulp/res/css/themes/yotsuba b.css +++ b/gulp/res/css/themes/yotsuba b.css @@ -1,5 +1,6 @@ /*yotsuba b*/ :root { + --icon-color:invert(17%)sepia(89%)saturate(7057%)hue-rotate(2deg)brightness(93%)contrast(120%); --alt-label-color: #98E; --alt-font-color: black; --background-top: #d6daf0; diff --git a/gulp/res/css/themes/yotsuba.css b/gulp/res/css/themes/yotsuba.css index eb3ce9a9..f8127fe3 100644 --- a/gulp/res/css/themes/yotsuba.css +++ b/gulp/res/css/themes/yotsuba.css @@ -1,5 +1,6 @@ /*yotsuba b*/ :root { + --icon-color:invert(17%)sepia(89%)saturate(7057%)hue-rotate(2deg)brightness(93%)contrast(120%); --alt-label-color: #800; --alt-font-color: #fff; --background-top: #fed6af90; diff --git a/gulp/res/img/bg.png b/gulp/res/img/bg.png deleted file mode 100644 index c6ff698b..00000000 Binary files a/gulp/res/img/bg.png and /dev/null differ diff --git a/gulp/res/img/bumplock.png b/gulp/res/img/bumplock.png new file mode 100644 index 00000000..bf803307 Binary files /dev/null and b/gulp/res/img/bumplock.png differ diff --git a/gulp/res/img/bumplocked.png b/gulp/res/img/bumplocked.png deleted file mode 100644 index 111190eb..00000000 Binary files a/gulp/res/img/bumplocked.png and /dev/null differ diff --git a/gulp/res/img/bumplocked.svg b/gulp/res/img/bumplocked.svg deleted file mode 100644 index 7baba2c7..00000000 --- a/gulp/res/img/bumplocked.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/gulp/res/img/cyclic.png b/gulp/res/img/cyclic.png index dd898edf..ec56a235 100644 Binary files a/gulp/res/img/cyclic.png and b/gulp/res/img/cyclic.png differ diff --git a/gulp/res/img/cyclic.svg b/gulp/res/img/cyclic.svg deleted file mode 100644 index d74b5b2e..00000000 --- a/gulp/res/img/cyclic.svg +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/gulp/res/img/lock.png b/gulp/res/img/lock.png new file mode 100644 index 00000000..965d400d Binary files /dev/null and b/gulp/res/img/lock.png differ diff --git a/gulp/res/img/locked.png b/gulp/res/img/locked.png deleted file mode 100644 index d8b12e9c..00000000 Binary files a/gulp/res/img/locked.png and /dev/null differ diff --git a/gulp/res/img/locked.svg b/gulp/res/img/locked.svg deleted file mode 100644 index 83dba688..00000000 --- a/gulp/res/img/locked.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/gulp/res/img/spoiler.png b/gulp/res/img/spoiler.png index 4ec5e44d..1d3b6c20 100644 Binary files a/gulp/res/img/spoiler.png and b/gulp/res/img/spoiler.png differ diff --git a/gulp/res/img/sticky.png b/gulp/res/img/sticky.png index 8b8e9b74..51165dd1 100644 Binary files a/gulp/res/img/sticky.png and b/gulp/res/img/sticky.png differ diff --git a/gulp/res/img/sticky.svg b/gulp/res/img/sticky.svg deleted file mode 100644 index 79dcaea7..00000000 --- a/gulp/res/img/sticky.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - diff --git a/views/includes/posticons.pug b/views/includes/posticons.pug new file mode 100644 index 00000000..b031696b --- /dev/null +++ b/views/includes/posticons.pug @@ -0,0 +1,15 @@ +if post.sticky || post.bumplocked || post.locked || post.cyclic + span.post-icons + if post.sticky + img(src='/img/sticky.png' height='14' width='14' title='Sticky') + | + if post.bumplocked + img(src='/img/bumplock.png' height='14' width='14' title='Bumplocked') + | + if post.locked + img(src='/img/lock.png' height='14' width='14' title='Locked') + | + if post.cyclic + img(src='/img/cyclic.png' height='14' width='14' title='Cyclic') + | + diff --git a/views/includes/postmods.pug b/views/includes/postmods.pug deleted file mode 100644 index d4f6f042..00000000 --- a/views/includes/postmods.pug +++ /dev/null @@ -1,12 +0,0 @@ -if post.sticky - img(src='/img/sticky.png' height='12' width='12' title='Sticky') - | -if post.bumplocked - img(src='/img/bumplocked.png' height='12' width='12' title='Bumplocked') - | -if post.locked - img(src='/img/locked.png' height='12' width='12' title='Locked') - | -if post.cyclic - img(src='/img/cyclic.png' height='13' width='13' title='Cyclic') - | diff --git a/views/mixins/catalogtile.pug b/views/mixins/catalogtile.pug index fe540b7e..00aee23a 100644 --- a/views/mixins/catalogtile.pug +++ b/views/mixins/catalogtile.pug @@ -2,7 +2,7 @@ mixin catalogtile(board, post, index) .catalog-tile(data-board=post.board data-post-id=post.postId data-user-id=post.userId) - const postURL = `/${board._id}/thread/${post.postId}.html#${post.postId}` .post-info - include ../includes/postmods.pug + include ../includes/posticons.pug a.no-decoration.post-subject(href=postURL) #{post.subject || 'No subject'} br span(title='Replies') R: #{post.replyposts} diff --git a/views/mixins/post.pug b/views/mixins/post.pug index 51daef1a..606cb1eb 100644 --- a/views/mixins/post.pug +++ b/views/mixins/post.pug @@ -14,7 +14,7 @@ mixin post(post, truncate, manage=false, globalmanage=false, ban=false) input.post-check(type='checkbox', name='checkedposts' value=post.postId) | if !post.thread - include ../includes/postmods.pug + include ../includes/posticons.pug if post.subject span.post-subject #{post.subject} |