From 5221f34bab65904289bf0212bca9bd6a10312fa7 Mon Sep 17 00:00:00 2001 From: Aevann Date: Sat, 12 Aug 2023 16:22:47 +0300 Subject: [PATCH] make unread color different from target color --- files/assets/css/4chan.css | 2 +- files/assets/css/classic.css | 7 +++++-- files/assets/css/classic_dark.css | 4 ++++ files/assets/css/coffee.css | 2 +- files/assets/css/dark.css | 4 ++++ files/assets/css/light.css | 5 ++++- files/assets/css/main.css | 8 +++++++- files/assets/css/win98.css | 2 +- files/assets/events/fistmas/css/themes/light.css | 2 +- files/routes/jinja2.py | 5 +++++ files/templates/root.html | 4 +++- 11 files changed, 36 insertions(+), 9 deletions(-) diff --git a/files/assets/css/4chan.css b/files/assets/css/4chan.css index eaef950d4..1c424b246 100644 --- a/files/assets/css/4chan.css +++ b/files/assets/css/4chan.css @@ -156,6 +156,6 @@ h5.post-title a:visited { background-color: black !important; } -*:target, .unread { +.unread { background: #fdccad !important; } diff --git a/files/assets/css/classic.css b/files/assets/css/classic.css index 133e9bf5e..f05eae131 100644 --- a/files/assets/css/classic.css +++ b/files/assets/css/classic.css @@ -177,8 +177,11 @@ blockquote a { color: skyblue; } -*:target, .unread { - background-color: #9994 !important; +.unread { + background-color: #d9d9d9 !important; +} +*:target { + background: rgba(var(--primary_rgb), 0.2) !important; } /*userpage*/ diff --git a/files/assets/css/classic_dark.css b/files/assets/css/classic_dark.css index a32e2820a..4fe89fe31 100644 --- a/files/assets/css/classic_dark.css +++ b/files/assets/css/classic_dark.css @@ -11,3 +11,7 @@ #speed-carot-modal .speed-modal-option:hover, #speed-carot-modal .speed-modal-option:focus, #speed-carot-modal .speed-modal-option.selected { background-color: #444444; } + +.unread { + background-color: #3d3d3d !important; +} diff --git a/files/assets/css/coffee.css b/files/assets/css/coffee.css index 3bc0df2a2..f02c57e53 100644 --- a/files/assets/css/coffee.css +++ b/files/assets/css/coffee.css @@ -91,7 +91,7 @@ blockquote { color: #cfcfcf !important; } -*:target, .unread { +.unread { background: #ffffff88 !important; } diff --git a/files/assets/css/dark.css b/files/assets/css/dark.css index 06158d830..879f4b177 100644 --- a/files/assets/css/dark.css +++ b/files/assets/css/dark.css @@ -99,3 +99,7 @@ h5.post-title a:visited { [disabled], .disabled, button[disabled], .btn[disabled], button.disabled, .btn.disabled { color: #bbb !important; } + +*:target { + background: rgba(var(--primary_rgb), 0.2) !important; +} diff --git a/files/assets/css/light.css b/files/assets/css/light.css index 8d633a89c..8478337b8 100644 --- a/files/assets/css/light.css +++ b/files/assets/css/light.css @@ -76,9 +76,12 @@ blockquote { color: var(--gray-400) !important; } -*:target, .unread { +.unread { background: #dddddd !important; } +*:target { + background: rgba(var(--primary_rgb), 0.2) !important; +} h5.post-title a:visited { color: #7a7a7a !important; diff --git a/files/assets/css/main.css b/files/assets/css/main.css index 830cbab2f..15f81ab4f 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -5912,11 +5912,17 @@ html { content: ''; display: block; } -*:target, .unread { + +.unread { background: #ffffff22 !important; padding: 12px; padding-bottom: 4px; } +*:target { + background: rgba(var(--primary_rgb), 0.15) !important; + padding: 12px; + padding-bottom: 4px; +} .mod { padding: 2px 5px 3px 5px; diff --git a/files/assets/css/win98.css b/files/assets/css/win98.css index 404cd6e82..2e771d200 100644 --- a/files/assets/css/win98.css +++ b/files/assets/css/win98.css @@ -152,7 +152,7 @@ blockquote { color: #cfcfcf !important; } -*:target, .unread { +.unread { background: #ffffffaa !important; } diff --git a/files/assets/events/fistmas/css/themes/light.css b/files/assets/events/fistmas/css/themes/light.css index f012763cf..0fcd3a709 100644 --- a/files/assets/events/fistmas/css/themes/light.css +++ b/files/assets/events/fistmas/css/themes/light.css @@ -1,7 +1,7 @@ blockquote { color: var(--gray-400); } -*:target, .unread { +.unread { background: #00000022 !important; } .deleted { diff --git a/files/routes/jinja2.py b/files/routes/jinja2.py index 01bbb02c4..3f8e5fa34 100644 --- a/files/routes/jinja2.py +++ b/files/routes/jinja2.py @@ -4,6 +4,7 @@ from os import environ, listdir, path from flask import g, session, has_request_context, request from jinja2 import pass_context +from PIL import ImageColor from files.classes.user import User from files.helpers.assetcache import assetcache_path @@ -18,6 +19,10 @@ from files.__main__ import app, cache from urllib.parse import parse_qs, urlencode, urlsplit +@app.template_filter("rgb") +def rgb(color): + return str(ImageColor.getcolor(f"#{color}", "RGB"))[1:-1] + @app.template_filter("formkey") def formkey(u): return get_formkey(u) diff --git a/files/templates/root.html b/files/templates/root.html index c1acfb69a..de8ac96d5 100644 --- a/files/templates/root.html +++ b/files/templates/root.html @@ -12,7 +12,9 @@ {%- if IS_DKD() and not (v and v.theme == 'light') -%} style="--primary:#2AAA8A" {%- elif not IS_FISTMAS() -%} - style="--primary:#{{v.themecolor if v else DEFAULT_COLOR}}" + {% set primary = v.themecolor if v else DEFAULT_COLOR %} + {% set primary_rgb = primary|rgb %} + style="--primary:#{{primary}};--primary_rgb:{{primary_rgb}}" {%- endif -%} >