From fae00f25e340681eb85f2df6f3655f4735f4f807 Mon Sep 17 00:00:00 2001 From: akinokonomi <91767492+akinokonomi@users.noreply.github.com> Date: Fri, 2 Dec 2022 06:16:20 +0000 Subject: [PATCH] Update new color keys in metadata.xml (nudus skins) (#850) * Update colors in metadata.xml (nudus skins). * Update nudus dark SCSS file. Coding style/readability. Co-authored-by: akinokonomi --- resources/skins/nudus-dark/html_style.css | 8 +-- resources/skins/nudus-dark/html_style.scss | 62 ++++++++++------------ resources/skins/nudus-dark/metadata.xml | 19 ++++--- resources/skins/nudus-light/metadata.xml | 16 +++--- 4 files changed, 54 insertions(+), 51 deletions(-) diff --git a/resources/skins/nudus-dark/html_style.css b/resources/skins/nudus-dark/html_style.css index a898e4223..677cf06a3 100644 --- a/resources/skins/nudus-dark/html_style.css +++ b/resources/skins/nudus-dark/html_style.css @@ -155,14 +155,14 @@ blockquote { } blockquote, blockquote p { - color: #D8D8D8; + color: #E2E2E2; } pre, code { border: 1px solid #282a2c; border-radius: 0.3em; - color: #D8D8D8; + color: #E2E2E2; font-family: monospace; font-size: .95rem !important; } @@ -464,7 +464,7 @@ body::-webkit-scrollbar-corner { border-radius: 0 0.3em 0.3em 0; } -/* Please enable JS for additional font-colouring features */ +/* Please enable JS for additional colouring features */ :root { --rssguard-red: 0; --rssguard-green: 0; @@ -488,7 +488,7 @@ body::-webkit-scrollbar-corner { body, ::selection, mark, code, pre, pre > code, -blockquote { +blockquote, blockquote p { color: hsla(0, 0%, calc( ( var(--rssguard-perceived-lightness) - var(--rssguard-threshold) ) * -10000000% ), 0.9); } diff --git a/resources/skins/nudus-dark/html_style.scss b/resources/skins/nudus-dark/html_style.scss index 6f4ccb00f..f8d312e6e 100644 --- a/resources/skins/nudus-dark/html_style.scss +++ b/resources/skins/nudus-dark/html_style.scss @@ -4,23 +4,17 @@ $qtbg-base: #373A3D !default; // clr_basbg $qtbg-button: #323437 !default; // clr_altbg // button bg (scrollbar, alt bg) $qcselbg: #8291AD !default; // clr_selbg -// -// Emulate fusion colour processing (dark only) -// +// {{{ Emulate Fusion colour processing (dark only) -// // Scrollbar colours -// //$qcbgbg: lighten($qtbg-button, 6%); // See toolbar bg $bgscroll: lighten($qtbg-button, 2%) !default; // track and corner bg $tr-border: darken($qtbg-button, 4%) !default; // track brdr -// -// Scrollbar thumb -// +// {{{ Scrollbar thumb -// bg gradient +// Thumb bg gradient // Normal $thscrlin: lighten($qtbg-button, 6%) !default; @@ -33,17 +27,19 @@ $thscrlhvout: $thscrlout; // Light outline $th-border: lighten($qtbg-button, 15%) !default; -// -// HTML palette (Colours) -// +// }}} + +// }}} + +// {{{ HTML palette (Colours) $cbg00: $qtbg-base; -// Irrelevant, because fg is overridden by the switcher ~~~ +// {{{ Irrelevant, because colour switcher (see below) overrides all fg colours (either with JS on or off) $cfg00: #f5f5f5 !default; -$cfg10: #D8D8D8 !default; +$cfg10: #E2E2E2 !default; $cfg11: $cfg10; -// ~~~ +// }}} $cbor2: #545556 !default; @@ -54,9 +50,9 @@ $cmark: #f8d08c66 !default; // 40% transparency $clink: $qcselbg; -// +// }}} + // Other -// $radius-unit: .3em !default; @@ -65,14 +61,12 @@ $radius-unit: .3em !default; ; // -// Dark HTML-style has following additions: +// Dark CSS style has following additions: // -// -// Border around viewport +// {{{ Border around viewport -// https://csswizardry.com/2010/12/simplified-page-borders-in-pure-css/ -// +// https://csswizardry.com/2010/12/simplified-page-borders-in-pure-css/ html::before, html::after, @@ -113,9 +107,9 @@ body::after { left: 0; } -// -// Enhanced scrollbar -// +// }}} + +// {{{ Dark-coloured scrollbar ::-webkit-scrollbar { height: 13px; @@ -212,7 +206,7 @@ $th-outline: } } -// More complete borders for `body` scrollbar +// Complete the borders for body scrollbar body::-webkit-scrollbar-thumb, body::-webkit-scrollbar-track { @@ -259,14 +253,14 @@ body::-webkit-scrollbar-corner { } } -// -// Font colour switcher +// }}} -// Thank you so much!! -// https://css-tricks.com/switch-font-color-for-different-backgrounds-with-css/ -// +// {{{ Fg colour switcher -/* Please enable JS for additional font-colouring features */ +// Thank you so much!! +// https://css-tricks.com/switch-font-color-for-different-backgrounds-with-css/ + +/* Please enable JS for additional colouring features */ :root { // Default RGB values for background colour --rssguard-red: 0; @@ -296,7 +290,7 @@ body::-webkit-scrollbar-corner { body, ::selection, mark, code, pre, pre > code, -blockquote { +blockquote, blockquote p { // TODO: why did not I add 'blockquote p' here before? color: hsla( 0, @@ -311,3 +305,5 @@ blockquote { .9 ); } +// }}} +// vim:foldmethod=marker diff --git a/resources/skins/nudus-dark/metadata.xml b/resources/skins/nudus-dark/metadata.xml index 4d3fc0bcb..ee7e31e19 100644 --- a/resources/skins/nudus-dark/metadata.xml +++ b/resources/skins/nudus-dark/metadata.xml @@ -1,14 +1,14 @@ - + akinokonomi, martinrotter - Dark variant of 'nudus-light' skin. + Dark variation of a simple, unclothed theme. - #85ACF6 - #D9E3F7 - #c684f4 - #d3a3f4 + #F2F2F2 + #FFFFFF + #85ACF6 + #D9E3F7 #DF5656 #910303 #44AA44 @@ -30,7 +30,7 @@ #2D2F32 #323437 - #D8D8D8 + #E2E2E2 #373A3D #FFFFFF #A7A7A7 @@ -49,4 +49,7 @@ #999999 - \ No newline at end of file + + diff --git a/resources/skins/nudus-light/metadata.xml b/resources/skins/nudus-light/metadata.xml index a190f8ff8..c1cc3c29f 100644 --- a/resources/skins/nudus-light/metadata.xml +++ b/resources/skins/nudus-light/metadata.xml @@ -1,17 +1,21 @@ - + akinokonomi, martinrotter + Simple, unclothed theme. In loving memory of the vergilius (not a person). - #3A6FE4 - #F0F2FC - #cc39e2 - #d57fe2 + #11204F + #FFFFFF + #3A6FE4 + #F0F2FC #E74343 #FFD7D7 #77dd77 false - \ No newline at end of file + +