From 9da359592dd176c38bbbe9d6987311c3fe855702 Mon Sep 17 00:00:00 2001 From: BPplays Date: Sun, 28 Apr 2024 23:45:09 -0700 Subject: [PATCH 01/25] added japanesewithanime.com --- styles/japanesewithanime.com/README.md | 38 +++++ .../japanesewithanime.com/catppuccin.user.css | 143 ++++++++++++++++++ styles/japanesewithanime.com/preview.webp | 3 + 3 files changed, 184 insertions(+) create mode 100644 styles/japanesewithanime.com/README.md create mode 100644 styles/japanesewithanime.com/catppuccin.user.css create mode 100644 styles/japanesewithanime.com/preview.webp diff --git a/styles/japanesewithanime.com/README.md b/styles/japanesewithanime.com/README.md new file mode 100644 index 0000000000..654996f5ca --- /dev/null +++ b/styles/japanesewithanime.com/README.md @@ -0,0 +1,38 @@ + + + +

+ Logo
+ + Catppuccin for paste.rs + +

+ +

+ + +

+ +

+ +

+ + + +## 💝 Current Maintainer +- [Guaxinim5573](https://github.com/Guaxinim5573) + +## 💖 Past Maintainer +- [Stonks3141](https://github.com/Stonks3141) + +  + +

+ +

+ +

+ Copyright © 2021-present Catppuccin Org +

+ + diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css new file mode 100644 index 0000000000..516a5ccb33 --- /dev/null +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -0,0 +1,143 @@ +/* ==UserStyle== +@name japanesewithanime.com Catppuccin +@namespace github.com/catppuccin/userstyles/styles/japanesewithanime.com +@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/japanesewithanime.com +@version 0.0.1 +@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/japanesewithanime.com/catppuccin.user.css +@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Ajapanesewithanime.com +@description Soothing pastel theme for paste.rs +@author Catppuccin +@license MIT + +@preprocessor less +@var select lightFlavor "Light Flavor" ["latte:Latte*", "frappe:Frappé", "macchiato:Macchiato", "mocha:Mocha"] +@var select darkFlavor "Dark Flavor" ["latte:Latte", "frappe:Frappé", "macchiato:Macchiato", "mocha:Mocha*"] +@var select accentColor "Accent" ["rosewater:Rosewater", "flamingo:Flamingo", "pink:Pink", "mauve:Mauve*", "red:Red", "maroon:Maroon", "peach:Peach", "yellow:Yellow", "green:Green", "teal:Teal", "blue:Blue", "sapphire:Sapphire", "sky:Sky", "lavender:Lavender", "subtext0:Gray"] +==/UserStyle== */ + +@-moz-document domain("japanesewithanime.com") { + @media (prefers-color-scheme: light) { + #catppuccin(@lightFlavor, @accentColor); + } + @media (prefers-color-scheme: dark) { + #catppuccin(@darkFlavor, @accentColor); + } + + #catppuccin(@lookup, @accent) { + @rosewater: @catppuccin[@@lookup][@rosewater]; + @flamingo: @catppuccin[@@lookup][@flamingo]; + @pink: @catppuccin[@@lookup][@pink]; + @mauve: @catppuccin[@@lookup][@mauve]; + @red: @catppuccin[@@lookup][@red]; + @maroon: @catppuccin[@@lookup][@maroon]; + @peach: @catppuccin[@@lookup][@peach]; + @yellow: @catppuccin[@@lookup][@yellow]; + @green: @catppuccin[@@lookup][@green]; + @teal: @catppuccin[@@lookup][@teal]; + @sky: @catppuccin[@@lookup][@sky]; + @sapphire: @catppuccin[@@lookup][@sapphire]; + @blue: @catppuccin[@@lookup][@blue]; + @lavender: @catppuccin[@@lookup][@lavender]; + @text: @catppuccin[@@lookup][@text]; + @subtext1: @catppuccin[@@lookup][@subtext1]; + @subtext0: @catppuccin[@@lookup][@subtext0]; + @overlay2: @catppuccin[@@lookup][@overlay2]; + @overlay1: @catppuccin[@@lookup][@overlay1]; + @overlay0: @catppuccin[@@lookup][@overlay0]; + @surface2: @catppuccin[@@lookup][@surface2]; + @surface1: @catppuccin[@@lookup][@surface1]; + @surface0: @catppuccin[@@lookup][@surface0]; + @base: @catppuccin[@@lookup][@base]; + @mantle: @catppuccin[@@lookup][@mantle]; + @crust: @catppuccin[@@lookup][@crust]; + @accent-color: @catppuccin[@@lookup][@@accent]; + + color-scheme: if(@lookup = latte, light, dark); + + ::selection { + background-color: fade(@accent-color, 30%); + } + + body, html{ + color: #cdd6f4 !important; + background-color: #1e1e2e !important; + } + body *::-webkit-scrollbar-button{ + color: #cdd6f4 !important; + background-color: #1e1e2e !important; + border: 0px !important; + } + .post-body i, + .featured-posts i{ + color: @accent-color !important; + } + a.placeholder-link{ + color: @red !important; + } + a:link, + a:visited{ + color: @accent-color !important; + } + + input.gsc-input, + input.gsc-search-button{ + color: @text !important; + background-color: @surface0 !important; + border: 2px solid @surface0 !important; + border-radius: 2px; + } + + #jwa-header{ + background: fade(@red, 50%) !important; + border-bottom: 0px !important; + } + .megaNav__toptab{ + background: #f38ba8 !important; + border: 0px !important; + } + #blog-title, + #blog-title>a, + .date-header, + .widget .title, .widget>h2{ + color: @text !important; + } + + #archive-year-select, + #archive-month-select{ + color: @text !important; + background-color: @surface0 !important; + border: 2px solid @surface0 !important; + border-radius: 2px; + } + + select { + color: white; /* Text color */ + background-color: #333; /* Background color */ + } + + .jwa-share-btn__icon{ + fill: @text !important; + } + .jwa-share-btn_mastodon{ + background-color: saturate(darken(@mauve, 10%), -10%) !important; + } + + .post-body h2:target, .post-body h3:target, .post-body h4:target, cite:target, + .warning-note{ + color: @text !important; + background-color: @surface0 !important; + border: 0px + } + + } +} + +/* prettier-ignore */ +@catppuccin: { + @latte: { @rosewater: #dc8a78; @flamingo: #dd7878; @pink: #ea76cb; @mauve: #8839ef; @red: #d20f39; @maroon: #e64553; @peach: #fe640b; @yellow: #df8e1d; @green: #40a02b; @teal: #179299; @sky: #04a5e5; @sapphire: #209fb5; @blue: #1e66f5; @lavender: #7287fd; @text: #4c4f69; @subtext1: #5c5f77; @subtext0: #6c6f85; @overlay2: #7c7f93; @overlay1: #8c8fa1; @overlay0: #9ca0b0; @surface2: #acb0be; @surface1: #bcc0cc; @surface0: #ccd0da; @base: #eff1f5; @mantle: #e6e9ef; @crust: #dce0e8; }; + @frappe: { @rosewater: #f2d5cf; @flamingo: #eebebe; @pink: #f4b8e4; @mauve: #ca9ee6; @red: #e78284; @maroon: #ea999c; @peach: #ef9f76; @yellow: #e5c890; @green: #a6d189; @teal: #81c8be; @sky: #99d1db; @sapphire: #85c1dc; @blue: #8caaee; @lavender: #babbf1; @text: #c6d0f5; @subtext1: #b5bfe2; @subtext0: #a5adce; @overlay2: #949cbb; @overlay1: #838ba7; @overlay0: #737994; @surface2: #626880; @surface1: #51576d; @surface0: #414559; @base: #303446; @mantle: #292c3c; @crust: #232634; }; + @macchiato: { @rosewater: #f4dbd6; @flamingo: #f0c6c6; @pink: #f5bde6; @mauve: #c6a0f6; @red: #ed8796; @maroon: #ee99a0; @peach: #f5a97f; @yellow: #eed49f; @green: #a6da95; @teal: #8bd5ca; @sky: #91d7e3; @sapphire: #7dc4e4; @blue: #8aadf4; @lavender: #b7bdf8; @text: #cad3f5; @subtext1: #b8c0e0; @subtext0: #a5adcb; @overlay2: #939ab7; @overlay1: #8087a2; @overlay0: #6e738d; @surface2: #5b6078; @surface1: #494d64; @surface0: #363a4f; @base: #24273a; @mantle: #1e2030; @crust: #181926; }; + @mocha: { @rosewater: #f5e0dc; @flamingo: #f2cdcd; @pink: #f5c2e7; @mauve: #cba6f7; @red: #f38ba8; @maroon: #eba0ac; @peach: #fab387; @yellow: #f9e2af; @green: #a6e3a1; @teal: #94e2d5; @sky: #89dceb; @sapphire: #74c7ec; @blue: #89b4fa; @lavender: #b4befe; @text: #cdd6f4; @subtext1: #bac2de; @subtext0: #a6adc8; @overlay2: #9399b2; @overlay1: #7f849c; @overlay0: #6c7086; @surface2: #585b70; @surface1: #45475a; @surface0: #313244; @base: #1e1e2e; @mantle: #181825; @crust: #11111b; }; +} + +// vim:ft=less diff --git a/styles/japanesewithanime.com/preview.webp b/styles/japanesewithanime.com/preview.webp new file mode 100644 index 0000000000..59ec69531a --- /dev/null +++ b/styles/japanesewithanime.com/preview.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0fbb761df28cf156b2cfbc4eaee09558034120a48833677f7368d00fae78ce88 +size 84062 From 0485039ae32c5d923dda911599afd71708657e79 Mon Sep 17 00:00:00 2001 From: BPplays Date: Mon, 29 Apr 2024 02:45:01 -0700 Subject: [PATCH 02/25] added stuff to japanesewithanime.com --- .../japanesewithanime.com/catppuccin.user.css | 149 ++++++++++++++++-- 1 file changed, 133 insertions(+), 16 deletions(-) diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css index 516a5ccb33..dc6aa5fffa 100644 --- a/styles/japanesewithanime.com/catppuccin.user.css +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -5,7 +5,7 @@ @version 0.0.1 @updateURL https://github.com/catppuccin/userstyles/raw/main/styles/japanesewithanime.com/catppuccin.user.css @supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Ajapanesewithanime.com -@description Soothing pastel theme for paste.rs +@description Soothing pastel theme for japanesewithanime.com @author Catppuccin @license MIT @@ -13,17 +13,18 @@ @var select lightFlavor "Light Flavor" ["latte:Latte*", "frappe:Frappé", "macchiato:Macchiato", "mocha:Mocha"] @var select darkFlavor "Dark Flavor" ["latte:Latte", "frappe:Frappé", "macchiato:Macchiato", "mocha:Mocha*"] @var select accentColor "Accent" ["rosewater:Rosewater", "flamingo:Flamingo", "pink:Pink", "mauve:Mauve*", "red:Red", "maroon:Maroon", "peach:Peach", "yellow:Yellow", "green:Green", "teal:Teal", "blue:Blue", "sapphire:Sapphire", "sky:Sky", "lavender:Lavender", "subtext0:Gray"] +@var select linkColor "Link color" ["rosewater:Rosewater", "flamingo:Flamingo", "pink:Pink", "mauve:Mauve*", "red:Red", "maroon:Maroon", "peach:Peach", "yellow:Yellow", "green:Green", "teal:Teal", "blue:Blue", "sapphire:Sapphire", "sky:Sky", "lavender:Lavender", "subtext0:Gray"] ==/UserStyle== */ @-moz-document domain("japanesewithanime.com") { @media (prefers-color-scheme: light) { - #catppuccin(@lightFlavor, @accentColor); + #catppuccin(@lightFlavor, @accentColor, @linkColor); } @media (prefers-color-scheme: dark) { - #catppuccin(@darkFlavor, @accentColor); + #catppuccin(@darkFlavor, @accentColor, @linkColor); } - #catppuccin(@lookup, @accent) { + #catppuccin(@lookup, @accent, @lnk) { @rosewater: @catppuccin[@@lookup][@rosewater]; @flamingo: @catppuccin[@@lookup][@flamingo]; @pink: @catppuccin[@@lookup][@pink]; @@ -51,6 +52,7 @@ @mantle: @catppuccin[@@lookup][@mantle]; @crust: @catppuccin[@@lookup][@crust]; @accent-color: @catppuccin[@@lookup][@@accent]; + @link-color: @catppuccin[@@lookup][@@lnk]; color-scheme: if(@lookup = latte, light, dark); @@ -58,6 +60,7 @@ background-color: fade(@accent-color, 30%); } + body, html{ color: #cdd6f4 !important; background-color: #1e1e2e !important; @@ -69,39 +72,134 @@ } .post-body i, .featured-posts i{ - color: @accent-color !important; + color: @accent-color } a.placeholder-link{ color: @red !important; } a:link, a:visited{ - color: @accent-color !important; + color: @link-color !important; + } + + + input.gsc-search-button{ + color: @text !important; + background-color: @surface1 !important; + border: 4px solid @surface1 !important; + // border-radius: 2px; + + border-top-right-radius: 2px; + border-bottom-right-radius: 2px; } - input.gsc-input, - input.gsc-search-button{ + input.gsc-input{ color: @text !important; background-color: @surface0 !important; - border: 2px solid @surface0 !important; + border: 4px solid @surface0 !important; + // border-radius: 2px; + border-top-left-radius: 2px; + border-bottom-left-radius: 2px; + } + + #sidebar-divider{ + border-left: 1px solid @surface0 !important; + } + + #myTopSearchFormInput{ + color: @text !important; + background-color: @surface0 !important; + border: 6px solid @surface0 !important; + border-radius: 4px; + } + + .status-msg-body, + .post-footer{ + color: @text !important; + background-color: @surface0 !important; + border: 1px solid @surface0 !important; + border-radius: 2px; + } + + .post-header-warning-nsfw{ + color: @text !important; + background-color: @surface0 !important; + border: 1px solid @surface0 !important; + border-radius: 2px; + box-shadow: 0px 0px rgba(0, 0, 0, 0) + } + + #fallback-wrapper{ + background-color: @base !important; + color: @accent-color !important; + } + + .megaNav__Particles > a, .megaNav__Symbols > a{ + background-color: @surface0 !important; + border: 4px solid @surface0 !important; border-radius: 2px; } #jwa-header{ - background: fade(@red, 50%) !important; + // background: fade(@red, 50%) !important; + background: @surface0 !important; border-bottom: 0px !important; } - .megaNav__toptab{ - background: #f38ba8 !important; + .megaNav__toptab, + a.megaNav__toptab{ + // background: @red !important; + background: @surface1 !important; + color: @text !important; border: 0px !important; } #blog-title, #blog-title>a, .date-header, - .widget .title, .widget>h2{ + .widget .title, .widget>h2,{ color: @text !important; } + .small-ads-label{ + color: @subtext0 !important; + } + + .visualNav > a{ + color: transparent !important; + } + + .navboxBody , + .navboxLabel{ + color: @text !important; + background-color: @surface0 !important; + } + + .categoryNavbox{ + color: @text !important; + background-color: @surface0 !important; + border: 2px solid @surface0 !important; + border-radius: 2px; + } + + .post-donation-cta{ + color: @text !important; + background-color: @surface0 !important; + border: 4px solid @surface0 !important; + border-radius: 4px; + } + + .my-breadcrumb-path{ + background-color: @base !important; + } + + .post-tags-slot>a::before{ + color: @text !important; + } + + .my-breadcrumb-node.crumb-to-here{ + color: @text !important; + } + + #archive-year-select, #archive-month-select{ color: @text !important; @@ -110,9 +208,24 @@ border-radius: 2px; } - select { - color: white; /* Text color */ - background-color: #333; /* Background color */ + // .T4LgNb, + // .kFwPee, + // c-wiz{ + // color: @text !important; + // background-color: @base !important; + // } + + .x5vlw, + .kFwPee, + .Pc9Gce, + .K5XaHb, + .SSPGKf, + .T4LgNb, + .T4LgNb .eejsDc, + .EIlDfe, + .EIlDfe body { + color: @text !important; + background-color: @surface0 !important; } .jwa-share-btn__icon{ @@ -129,6 +242,10 @@ border: 0px } + dfn{ + border-color: @accent-color + } + } } From 7334bdb22eca2b2457da650a76d784460d8aeb06 Mon Sep 17 00:00:00 2001 From: BPplays Date: Mon, 29 Apr 2024 02:51:17 -0700 Subject: [PATCH 03/25] fixed .readership-survey-notice --- .../japanesewithanime.com/catppuccin.user.css | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css index dc6aa5fffa..1c5e4d258d 100644 --- a/styles/japanesewithanime.com/catppuccin.user.css +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -208,6 +208,27 @@ border-radius: 2px; } + .readership-survey-notice h2{ + margin-left: -12px; + margin-right: -12px; + padding-left: 12px; + padding-right: 12px; + color: @text !important; + background-color: @surface1 !important; + border: 4px solid @surface1 !important; + border-top-left-radius: 2px; + border-top-right-radius: 2px; + } + + .readership-survey-notice{ + color: @text !important; + background-color: @surface0 !important; + border: 0px solid @surface0 !important; + border-radius: 2px; + padding-left: 12px; + padding-right: 12px; + } + // .T4LgNb, // .kFwPee, // c-wiz{ From 47c07fb58b2e90d9af5c3fcbe42ad46b85123bc3 Mon Sep 17 00:00:00 2001 From: BPplays Date: Mon, 29 Apr 2024 02:52:49 -0700 Subject: [PATCH 04/25] fixed .homepage-description --- styles/japanesewithanime.com/catppuccin.user.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css index 1c5e4d258d..38e5f0229c 100644 --- a/styles/japanesewithanime.com/catppuccin.user.css +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -159,7 +159,8 @@ color: @text !important; } - .small-ads-label{ + .small-ads-label, + .homepage-description{ color: @subtext0 !important; } From e51e93424dca643828734af827da7c1d0ff6d00f Mon Sep 17 00:00:00 2001 From: BPplays Date: Mon, 29 Apr 2024 02:58:48 -0700 Subject: [PATCH 05/25] misc fixes --- .../japanesewithanime.com/catppuccin.user.css | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css index 38e5f0229c..d29e1d6581 100644 --- a/styles/japanesewithanime.com/catppuccin.user.css +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -71,7 +71,8 @@ border: 0px !important; } .post-body i, - .featured-posts i{ + .featured-posts i, + :not(a).transcript-extra{ color: @accent-color } a.placeholder-link{ @@ -102,6 +103,17 @@ border-bottom-left-radius: 2px; } + .blog-pager-newer-link, .blog-pager-older-link, .home-link{ + background-color: @surface0 !important; + } + + .bf__heading{ + color: @subtext1 !important; + } + .fsm__cta{ + color: @subtext0 !important; + } + #sidebar-divider{ border-left: 1px solid @surface0 !important; } @@ -121,7 +133,8 @@ border-radius: 2px; } - .post-header-warning-nsfw{ + .post-header-warning-nsfw, + .post-header-warning-wip{ color: @text !important; background-color: @surface0 !important; border: 1px solid @surface0 !important; From 018b55ebe13884d22cc8058a7249ed1713531600 Mon Sep 17 00:00:00 2001 From: BPplays Date: Mon, 29 Apr 2024 03:03:10 -0700 Subject: [PATCH 06/25] misc fixes --- styles/japanesewithanime.com/README.md | 38 --------------- .../japanesewithanime.com/catppuccin.user.css | 46 +++++++++++-------- styles/japanesewithanime.com/preview.webp | 4 +- 3 files changed, 28 insertions(+), 60 deletions(-) delete mode 100644 styles/japanesewithanime.com/README.md diff --git a/styles/japanesewithanime.com/README.md b/styles/japanesewithanime.com/README.md deleted file mode 100644 index 654996f5ca..0000000000 --- a/styles/japanesewithanime.com/README.md +++ /dev/null @@ -1,38 +0,0 @@ - - - -

- Logo
- - Catppuccin for paste.rs - -

- -

- - -

- -

- -

- - - -## 💝 Current Maintainer -- [Guaxinim5573](https://github.com/Guaxinim5573) - -## 💖 Past Maintainer -- [Stonks3141](https://github.com/Stonks3141) - -  - -

- -

- -

- Copyright © 2021-present Catppuccin Org -

- - diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css index d29e1d6581..680aafe126 100644 --- a/styles/japanesewithanime.com/catppuccin.user.css +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -24,7 +24,7 @@ #catppuccin(@darkFlavor, @accentColor, @linkColor); } - #catppuccin(@lookup, @accent, @lnk) { + #catppuccin(@lookup, @accent, @lnk) { @rosewater: @catppuccin[@@lookup][@rosewater]; @flamingo: @catppuccin[@@lookup][@flamingo]; @pink: @catppuccin[@@lookup][@pink]; @@ -60,6 +60,12 @@ background-color: fade(@accent-color, 30%); } + input, + textarea { + &::placeholder { + color: @subtext0 !important; + } + } body, html{ color: #cdd6f4 !important; @@ -72,7 +78,7 @@ } .post-body i, .featured-posts i, - :not(a).transcript-extra{ + :not(a).transcript-extra{ color: @accent-color } a.placeholder-link{ @@ -134,12 +140,12 @@ } .post-header-warning-nsfw, - .post-header-warning-wip{ + .post-header-warning-wip{ color: @text !important; background-color: @surface0 !important; border: 1px solid @surface0 !important; border-radius: 2px; - box-shadow: 0px 0px rgba(0, 0, 0, 0) + box-shadow: 0px 0px rgba(0, 0, 0, 0) } #fallback-wrapper{ @@ -173,7 +179,7 @@ } .small-ads-label, - .homepage-description{ + .homepage-description{ color: @subtext0 !important; } @@ -223,10 +229,10 @@ } .readership-survey-notice h2{ - margin-left: -12px; - margin-right: -12px; - padding-left: 12px; - padding-right: 12px; + margin-left: -12px; + margin-right: -12px; + padding-left: 12px; + padding-right: 12px; color: @text !important; background-color: @surface1 !important; border: 4px solid @surface1 !important; @@ -239,8 +245,8 @@ background-color: @surface0 !important; border: 0px solid @surface0 !important; border-radius: 2px; - padding-left: 12px; - padding-right: 12px; + padding-left: 12px; + padding-right: 12px; } // .T4LgNb, @@ -251,14 +257,14 @@ // } .x5vlw, - .kFwPee, - .Pc9Gce, - .K5XaHb, - .SSPGKf, - .T4LgNb, - .T4LgNb .eejsDc, - .EIlDfe, - .EIlDfe body { + .kFwPee, + .Pc9Gce, + .K5XaHb, + .SSPGKf, + .T4LgNb, + .T4LgNb .eejsDc, + .EIlDfe, + .EIlDfe body { color: @text !important; background-color: @surface0 !important; } @@ -281,7 +287,7 @@ border-color: @accent-color } - } + } } /* prettier-ignore */ diff --git a/styles/japanesewithanime.com/preview.webp b/styles/japanesewithanime.com/preview.webp index 59ec69531a..d58ea81f46 100644 --- a/styles/japanesewithanime.com/preview.webp +++ b/styles/japanesewithanime.com/preview.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fbb761df28cf156b2cfbc4eaee09558034120a48833677f7368d00fae78ce88 -size 84062 +oid sha256:676bd77f20e746524ea7b3ccab01bb124546246d5f880e754f61109fc4191305 +size 21134 From 5425380c9868b7d654aa19473de77697b6164f0b Mon Sep 17 00:00:00 2001 From: BPplays Date: Mon, 29 Apr 2024 03:53:05 -0700 Subject: [PATCH 07/25] misc fixes --- .../japanesewithanime.com/catppuccin.user.css | 44 ++++++++++++++----- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css index 680aafe126..48fa83145c 100644 --- a/styles/japanesewithanime.com/catppuccin.user.css +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -12,16 +12,20 @@ @preprocessor less @var select lightFlavor "Light Flavor" ["latte:Latte*", "frappe:Frappé", "macchiato:Macchiato", "mocha:Mocha"] @var select darkFlavor "Dark Flavor" ["latte:Latte", "frappe:Frappé", "macchiato:Macchiato", "mocha:Mocha*"] -@var select accentColor "Accent" ["rosewater:Rosewater", "flamingo:Flamingo", "pink:Pink", "mauve:Mauve*", "red:Red", "maroon:Maroon", "peach:Peach", "yellow:Yellow", "green:Green", "teal:Teal", "blue:Blue", "sapphire:Sapphire", "sky:Sky", "lavender:Lavender", "subtext0:Gray"] -@var select linkColor "Link color" ["rosewater:Rosewater", "flamingo:Flamingo", "pink:Pink", "mauve:Mauve*", "red:Red", "maroon:Maroon", "peach:Peach", "yellow:Yellow", "green:Green", "teal:Teal", "blue:Blue", "sapphire:Sapphire", "sky:Sky", "lavender:Lavender", "subtext0:Gray"] +@var select accentColor "Accent" ["rosewater:Rosewater", "flamingo:Flamingo", "pink:Pink", "mauve:Mauve", "red:Red*", "maroon:Maroon", "peach:Peach", "yellow:Yellow", "green:Green", "teal:Teal", "blue:Blue", "sapphire:Sapphire", "sky:Sky", "lavender:Lavender", "subtext0:Gray"] +@var select linkColor "Link color" ["rosewater:Rosewater", "flamingo:Flamingo", "pink:Pink", "mauve:Mauve", "red:Red", "maroon:Maroon", "peach:Peach", "yellow:Yellow", "green:Green", "teal:Teal", "blue:Blue*", "sapphire:Sapphire", "sky:Sky", "lavender:Lavender", "subtext0:Gray"] ==/UserStyle== */ @-moz-document domain("japanesewithanime.com") { @media (prefers-color-scheme: light) { - #catppuccin(@lightFlavor, @accentColor, @linkColor); + :root { + #catppuccin(@lightFlavor, @accentColor, @linkColor); + } } @media (prefers-color-scheme: dark) { - #catppuccin(@darkFlavor, @accentColor, @linkColor); + :root { + #catppuccin(@darkFlavor, @accentColor, @linkColor); + } } #catppuccin(@lookup, @accent, @lnk) { @@ -68,19 +72,27 @@ } body, html{ - color: #cdd6f4 !important; - background-color: #1e1e2e !important; + color: @text !important; + background-color: @base !important; } body *::-webkit-scrollbar-button{ - color: #cdd6f4 !important; - background-color: #1e1e2e !important; + color: @text !important; + background-color: @base !important; border: 0px !important; } - .post-body i, + .featured-posts i, :not(a).transcript-extra{ - color: @accent-color + color: @accent-color; } + + .post-body i{ + color: @accent-color; + } + .post-body a i{ + color: inherit !important; + } + a.placeholder-link{ color: @red !important; } @@ -268,10 +280,18 @@ color: @text !important; background-color: @surface0 !important; } + & when (@lookup = latte) { + .jwa-share-btn__icon{ + fill: @base !important; + } + } - .jwa-share-btn__icon{ - fill: @text !important; + & when not (@lookup = latte) { + .jwa-share-btn__icon{ + fill: @text !important; + } } + .jwa-share-btn_mastodon{ background-color: saturate(darken(@mauve, 10%), -10%) !important; } From 5ed57ba7eee829f9115f027d9748ff2ec25e3568 Mon Sep 17 00:00:00 2001 From: BPplays Date: Mon, 29 Apr 2024 03:55:56 -0700 Subject: [PATCH 08/25] updated userstyles.yml --- scripts/userstyles.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scripts/userstyles.yml b/scripts/userstyles.yml index bed4de9303..bbf023be41 100644 --- a/scripts/userstyles.yml +++ b/scripts/userstyles.yml @@ -125,6 +125,9 @@ collaborators: - &NK308 url: https://github.com/NK308 name: NK308 + - &BPplays + name: BPplays + url: https://github.com/BPplays userstyles: advent-of-code: @@ -849,6 +852,14 @@ userstyles: readme: app-link: "https://www.wikiwand.com" current-maintainers: [*tnixc] + japanesewithanime.com: + name: japanesewithanime.com + categories: [entertainment, education] + icon: youtube + color: red + readme: + app-link: "https://japanesewithanime.com" + current-maintainers: [*BPplays] youtube: name: YouTube categories: [entertainment, social_networking, photo_and_video] From 7a5c9da06c7315fe353b0506c76f0bbf44782051 Mon Sep 17 00:00:00 2001 From: BPplays Date: Mon, 29 Apr 2024 04:11:48 -0700 Subject: [PATCH 09/25] added preview.webp --- styles/japanesewithanime.com/preview.webp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/styles/japanesewithanime.com/preview.webp b/styles/japanesewithanime.com/preview.webp index d58ea81f46..39895e495d 100644 --- a/styles/japanesewithanime.com/preview.webp +++ b/styles/japanesewithanime.com/preview.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:676bd77f20e746524ea7b3ccab01bb124546246d5f880e754f61109fc4191305 -size 21134 +oid sha256:bb6e7c2c20d49face65687a538e23bb481bff59cdd60239dfc977ff13ed6b786 +size 629284 From 93a571e6c1b6982c79c8f8c947ddcde2149510b2 Mon Sep 17 00:00:00 2001 From: BPplays Date: Mon, 29 Apr 2024 04:28:57 -0700 Subject: [PATCH 10/25] fixed erroneous icon: youtube --- scripts/userstyles.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/userstyles.yml b/scripts/userstyles.yml index bbf023be41..aa75a0cf03 100644 --- a/scripts/userstyles.yml +++ b/scripts/userstyles.yml @@ -855,7 +855,6 @@ userstyles: japanesewithanime.com: name: japanesewithanime.com categories: [entertainment, education] - icon: youtube color: red readme: app-link: "https://japanesewithanime.com" From 4ce2724f7881d0ae544ee003c4295ce2ba1db12d Mon Sep 17 00:00:00 2001 From: BPplays Date: Mon, 29 Apr 2024 14:49:30 -0700 Subject: [PATCH 11/25] fixed linting issues --- .../japanesewithanime.com/catppuccin.user.css | 58 +++++++++++++------ 1 file changed, 41 insertions(+), 17 deletions(-) diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css index 48fa83145c..f929a7247a 100644 --- a/styles/japanesewithanime.com/catppuccin.user.css +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -78,7 +78,7 @@ body *::-webkit-scrollbar-button{ color: @text !important; background-color: @base !important; - border: 0px !important; + border-width: 0 !important; } .featured-posts i, @@ -105,7 +105,9 @@ input.gsc-search-button{ color: @text !important; background-color: @surface1 !important; - border: 4px solid @surface1 !important; + border-color: @surface1 !important; + border-width: 4px !important; + border-style: solid !important; // border-radius: 2px; border-top-right-radius: 2px; @@ -115,7 +117,9 @@ input.gsc-input{ color: @text !important; background-color: @surface0 !important; - border: 4px solid @surface0 !important; + border-color: @surface0 !important; + border-width: 4px !important; + border-style: solid !important; // border-radius: 2px; border-top-left-radius: 2px; border-bottom-left-radius: 2px; @@ -133,13 +137,17 @@ } #sidebar-divider{ - border-left: 1px solid @surface0 !important; + border-left-color: @surface0 !important; + border-left-width: 1px !important; + /* border-left-style: solid !important; */ } #myTopSearchFormInput{ color: @text !important; background-color: @surface0 !important; - border: 6px solid @surface0 !important; + border-color: @surface0 !important; + border-width: 6px !important; + border-style: solid !important; border-radius: 4px; } @@ -147,7 +155,9 @@ .post-footer{ color: @text !important; background-color: @surface0 !important; - border: 1px solid @surface0 !important; + border-color: @surface0 !important; + border-width: 1px !important; + border-style: solid !important; border-radius: 2px; } @@ -155,9 +165,11 @@ .post-header-warning-wip{ color: @text !important; background-color: @surface0 !important; - border: 1px solid @surface0 !important; + border-color: @surface0 !important; + border-width: 1px !important; + border-style: solid !important; border-radius: 2px; - box-shadow: 0px 0px rgba(0, 0, 0, 0) + box-shadow: none !important; } #fallback-wrapper{ @@ -167,21 +179,25 @@ .megaNav__Particles > a, .megaNav__Symbols > a{ background-color: @surface0 !important; - border: 4px solid @surface0 !important; + border-color: @surface0 !important; + border-width: 4px !important; + border-style: solid !important; border-radius: 2px; } #jwa-header{ // background: fade(@red, 50%) !important; background: @surface0 !important; - border-bottom: 0px !important; + border-bottom-width: 0 !important; } + + .megaNav__toptab, a.megaNav__toptab{ // background: @red !important; background: @surface1 !important; color: @text !important; - border: 0px !important; + border-width: 0 !important; } #blog-title, #blog-title>a, @@ -208,14 +224,18 @@ .categoryNavbox{ color: @text !important; background-color: @surface0 !important; - border: 2px solid @surface0 !important; + border-color: @surface0 !important; + border-width: 2px !important; + border-style: solid !important; border-radius: 2px; } .post-donation-cta{ color: @text !important; background-color: @surface0 !important; - border: 4px solid @surface0 !important; + border-color: @surface0 !important; + border-width: 4px !important; + border-style: solid !important; border-radius: 4px; } @@ -236,7 +256,9 @@ #archive-month-select{ color: @text !important; background-color: @surface0 !important; - border: 2px solid @surface0 !important; + border-color: @surface0 !important; + border-width: 2px !important; + border-style: solid !important; border-radius: 2px; } @@ -247,7 +269,9 @@ padding-right: 12px; color: @text !important; background-color: @surface1 !important; - border: 4px solid @surface1 !important; + border-color: @surface1 !important; + border-width: 4px !important; + border-style: solid !important; border-top-left-radius: 2px; border-top-right-radius: 2px; } @@ -255,7 +279,7 @@ .readership-survey-notice{ color: @text !important; background-color: @surface0 !important; - border: 0px solid @surface0 !important; + border-width: 0 !important; border-radius: 2px; padding-left: 12px; padding-right: 12px; @@ -300,7 +324,7 @@ .warning-note{ color: @text !important; background-color: @surface0 !important; - border: 0px + border-color: @surface0 !important; } dfn{ From 5c1debe0024c0901954d8a90c72b874fc7479585 Mon Sep 17 00:00:00 2001 From: BPplays Date: Mon, 29 Apr 2024 15:13:53 -0700 Subject: [PATCH 12/25] removed body *::-webkit-scrollbar-button and fixed #megaNav__contents --- styles/japanesewithanime.com/catppuccin.user.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css index f929a7247a..de0f0534d3 100644 --- a/styles/japanesewithanime.com/catppuccin.user.css +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -75,12 +75,13 @@ color: @text !important; background-color: @base !important; } - body *::-webkit-scrollbar-button{ + + + + #megaNav__contents{ color: @text !important; - background-color: @base !important; - border-width: 0 !important; + background-color: @surface1 !important; } - .featured-posts i, :not(a).transcript-extra{ color: @accent-color; From e08450d1fd57117cb166c5193a195e2895a1d808 Mon Sep 17 00:00:00 2001 From: BPplays Date: Mon, 29 Apr 2024 15:34:49 -0700 Subject: [PATCH 13/25] removed unnecessary formatting changes --- .../japanesewithanime.com/catppuccin.user.css | 48 +++---------------- 1 file changed, 6 insertions(+), 42 deletions(-) diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css index de0f0534d3..2346c20f62 100644 --- a/styles/japanesewithanime.com/catppuccin.user.css +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -107,23 +107,16 @@ color: @text !important; background-color: @surface1 !important; border-color: @surface1 !important; - border-width: 4px !important; + border-width: 1px !important; border-style: solid !important; - // border-radius: 2px; - - border-top-right-radius: 2px; - border-bottom-right-radius: 2px; + border-radius: 1px !important; } input.gsc-input{ color: @text !important; background-color: @surface0 !important; border-color: @surface0 !important; - border-width: 4px !important; - border-style: solid !important; - // border-radius: 2px; - border-top-left-radius: 2px; - border-bottom-left-radius: 2px; + border-radius: 1px !important; } .blog-pager-newer-link, .blog-pager-older-link, .home-link{ @@ -147,9 +140,6 @@ color: @text !important; background-color: @surface0 !important; border-color: @surface0 !important; - border-width: 6px !important; - border-style: solid !important; - border-radius: 4px; } .status-msg-body, @@ -157,9 +147,6 @@ color: @text !important; background-color: @surface0 !important; border-color: @surface0 !important; - border-width: 1px !important; - border-style: solid !important; - border-radius: 2px; } .post-header-warning-nsfw, @@ -167,9 +154,6 @@ color: @text !important; background-color: @surface0 !important; border-color: @surface0 !important; - border-width: 1px !important; - border-style: solid !important; - border-radius: 2px; box-shadow: none !important; } @@ -181,9 +165,7 @@ .megaNav__Particles > a, .megaNav__Symbols > a{ background-color: @surface0 !important; border-color: @surface0 !important; - border-width: 4px !important; - border-style: solid !important; - border-radius: 2px; + border-radius: 1px !important; } #jwa-header{ @@ -226,18 +208,13 @@ color: @text !important; background-color: @surface0 !important; border-color: @surface0 !important; - border-width: 2px !important; - border-style: solid !important; - border-radius: 2px; } .post-donation-cta{ color: @text !important; background-color: @surface0 !important; border-color: @surface0 !important; - border-width: 4px !important; - border-style: solid !important; - border-radius: 4px; + border-radius:1px !important; } .my-breadcrumb-path{ @@ -258,32 +235,19 @@ color: @text !important; background-color: @surface0 !important; border-color: @surface0 !important; - border-width: 2px !important; - border-style: solid !important; - border-radius: 2px; + border-radius:1px !important; } .readership-survey-notice h2{ - margin-left: -12px; - margin-right: -12px; - padding-left: 12px; - padding-right: 12px; color: @text !important; background-color: @surface1 !important; border-color: @surface1 !important; - border-width: 4px !important; - border-style: solid !important; - border-top-left-radius: 2px; - border-top-right-radius: 2px; } .readership-survey-notice{ color: @text !important; background-color: @surface0 !important; border-width: 0 !important; - border-radius: 2px; - padding-left: 12px; - padding-right: 12px; } // .T4LgNb, From 93020bd6b333e05ac2bf41b0de6ccd7acd2e35a8 Mon Sep 17 00:00:00 2001 From: BPplays Date: Sat, 25 May 2024 00:44:04 -0700 Subject: [PATCH 14/25] changed theme to add options for Prefer solid colors with no borders and Original search bar --- .../japanesewithanime.com/catppuccin.user.css | 110 +++++++++++++++--- 1 file changed, 93 insertions(+), 17 deletions(-) diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css index 2346c20f62..b688d488cc 100644 --- a/styles/japanesewithanime.com/catppuccin.user.css +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -14,6 +14,8 @@ @var select darkFlavor "Dark Flavor" ["latte:Latte", "frappe:Frappé", "macchiato:Macchiato", "mocha:Mocha*"] @var select accentColor "Accent" ["rosewater:Rosewater", "flamingo:Flamingo", "pink:Pink", "mauve:Mauve", "red:Red*", "maroon:Maroon", "peach:Peach", "yellow:Yellow", "green:Green", "teal:Teal", "blue:Blue", "sapphire:Sapphire", "sky:Sky", "lavender:Lavender", "subtext0:Gray"] @var select linkColor "Link color" ["rosewater:Rosewater", "flamingo:Flamingo", "pink:Pink", "mauve:Mauve", "red:Red", "maroon:Maroon", "peach:Peach", "yellow:Yellow", "green:Green", "teal:Teal", "blue:Blue*", "sapphire:Sapphire", "sky:Sky", "lavender:Lavender", "subtext0:Gray"] +@var checkbox solidColors "Prefer solid colors with no borders" 0 +@var checkbox ogBar "Original search bar" 0 ==/UserStyle== */ @-moz-document domain("japanesewithanime.com") { @@ -105,20 +107,45 @@ input.gsc-search-button{ color: @text !important; - background-color: @surface1 !important; - border-color: @surface1 !important; - border-width: 1px !important; - border-style: solid !important; - border-radius: 1px !important; - } + } input.gsc-input{ color: @text !important; background-color: @surface0 !important; - border-color: @surface0 !important; - border-radius: 1px !important; } + & when (@ogBar = 1) { + input.gsc-search-button{ + border-color: @overlay1 !important; + border-radius: 2px !important; + border-width: 1px !important; + padding-bottom: 1.8px !important; + padding-left: 6.6px !important; + padding-right: 6.6px !important; + padding-top: 1.8px !important; + border-style: solid !important; + background-color: @surface1 !important; + } + input.gsc-input{ + border-color: @surface1 !important; + } + } + & when (@ogBar = 0) { + input.gsc-search-button{ + background-color: @surface1 !important; + border-color: @surface1 !important; + border-width: 1px !important; + border-style: solid !important; + border-radius: 1px !important; + } + input.gsc-input{ + border-color: @surface0 !important; + border-radius: 1px !important; + } + } + + + .blog-pager-newer-link, .blog-pager-older-link, .home-link{ background-color: @surface0 !important; } @@ -153,20 +180,46 @@ .post-header-warning-wip{ color: @text !important; background-color: @surface0 !important; - border-color: @surface0 !important; - box-shadow: none !important; } + & when (@solidColors = 1) { + .post-header-warning-nsfw, + .post-header-warning-wip{ + border-color: @surface0 !important; + box-shadow: none !important; + } + } + & when (@solidColors = 0) { + .post-header-warning-nsfw, + .post-header-warning-wip{ + border-color: @accent-color !important; + } + } + #fallback-wrapper{ background-color: @base !important; color: @accent-color !important; } - .megaNav__Particles > a, .megaNav__Symbols > a{ + .line-tags { + color: @subtext0 !important; + } + + .megaNav__Particles > a, .megaNav__Symbols > a { background-color: @surface0 !important; - border-color: @surface0 !important; - border-radius: 1px !important; } + & when (@solidColors = 1) { + .megaNav__Particles > a, .megaNav__Symbols > a { + border-color: @surface0 !important; + border-radius: 1px !important; + } + } + & when (@solidColors = 0) { + .megaNav__Particles > a, .megaNav__Symbols > a { + border-color: @accent-color !important; + } + } + #jwa-header{ // background: fade(@red, 50%) !important; @@ -213,9 +266,19 @@ .post-donation-cta{ color: @text !important; background-color: @surface0 !important; - border-color: @surface0 !important; - border-radius:1px !important; + } + & when (@solidColors = 1) { + .post-donation-cta { + border-color: @surface0 !important; + border-radius:1px !important; + } + } + & when (@solidColors = 0) { + .post-donation-cta { + border-color: @accent-color !important; + } + } .my-breadcrumb-path{ background-color: @base !important; @@ -234,10 +297,23 @@ #archive-month-select{ color: @text !important; background-color: @surface0 !important; - border-color: @surface0 !important; - border-radius:1px !important; } + & when (@solidColors = 1) { + #archive-year-select, + #archive-month-select{ + border-color: @surface0 !important; + border-radius:1px !important; + } + } + & when (@solidColors = 0) { + #archive-year-select, + #archive-month-select{ + border-color: @surface2 !important; + border-radius:1px !important; + } + } + .readership-survey-notice h2{ color: @text !important; background-color: @surface1 !important; From 897cb3f7b97d17e4715f7edc30f9533ceec544c8 Mon Sep 17 00:00:00 2001 From: BPplays Date: Sat, 25 May 2024 01:19:02 -0700 Subject: [PATCH 15/25] added @warn-color --- .../japanesewithanime.com/catppuccin.user.css | 41 ++++++++++++------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css index b688d488cc..14b762ec63 100644 --- a/styles/japanesewithanime.com/catppuccin.user.css +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -59,7 +59,23 @@ @crust: @catppuccin[@@lookup][@crust]; @accent-color: @catppuccin[@@lookup][@@accent]; @link-color: @catppuccin[@@lookup][@@lnk]; + // Mixin to set variables based on conditions + .set-colors() when not (@accent-color = @yellow) and not (@link-color = @yellow) { + @warn-color: @yellow; + } + .set-colors() when (@accent-color = @yellow) or (@link-color = @yellow) { + @warn-color: @peach; + } + .set-colors() when (@accent-color = @peach) and (@link-color = @yellow) { + @warn-color: @maroon; + } + .set-colors() when (@accent-color = @yellow) and (@link-color = @peach) { + @warn-color: @maroon; + } + + // Apply the mixin to set the variables + .set-colors(); color-scheme: if(@lookup = latte, light, dark); ::selection { @@ -176,25 +192,22 @@ border-color: @surface0 !important; } - .post-header-warning-nsfw, + .post-header-warning-nsfw{ + color: @text !important; + background-color: @surface0 !important; + border-color: @accent-color !important; + box-shadow: none !important; + } + + .post-header-warning-wip{ color: @text !important; background-color: @surface0 !important; + border-color: @warn-color !important; + box-shadow: none !important; } - & when (@solidColors = 1) { - .post-header-warning-nsfw, - .post-header-warning-wip{ - border-color: @surface0 !important; - box-shadow: none !important; - } - } - & when (@solidColors = 0) { - .post-header-warning-nsfw, - .post-header-warning-wip{ - border-color: @accent-color !important; - } - } + #fallback-wrapper{ background-color: @base !important; From d8114fc6febae9f75ded28eccb8d3611def8d8aa Mon Sep 17 00:00:00 2001 From: BPplays Date: Sat, 25 May 2024 01:19:16 -0700 Subject: [PATCH 16/25] added @warn-color to more places --- styles/japanesewithanime.com/catppuccin.user.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css index 14b762ec63..9655e3b0eb 100644 --- a/styles/japanesewithanime.com/catppuccin.user.css +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -195,7 +195,7 @@ .post-header-warning-nsfw{ color: @text !important; background-color: @surface0 !important; - border-color: @accent-color !important; + border-color: @warn-color !important; box-shadow: none !important; } From ba7c2ba35d0201cbd5f786a9729962279fdf26dc Mon Sep 17 00:00:00 2001 From: BPplays Date: Sat, 25 May 2024 01:25:32 -0700 Subject: [PATCH 17/25] code formatting changes --- styles/japanesewithanime.com/catppuccin.user.css | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css index 9655e3b0eb..987b437789 100644 --- a/styles/japanesewithanime.com/catppuccin.user.css +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -59,7 +59,9 @@ @crust: @catppuccin[@@lookup][@crust]; @accent-color: @catppuccin[@@lookup][@@accent]; @link-color: @catppuccin[@@lookup][@@lnk]; - // Mixin to set variables based on conditions + + + .set-colors() when not (@accent-color = @yellow) and not (@link-color = @yellow) { @warn-color: @yellow; } @@ -73,9 +75,9 @@ @warn-color: @maroon; } - - // Apply the mixin to set the variables .set-colors(); + + color-scheme: if(@lookup = latte, light, dark); ::selection { From 0484b87cc4cc14e61e5b2b5ff48146caa4c3e257 Mon Sep 17 00:00:00 2001 From: BPplays Date: Sat, 25 May 2024 01:25:46 -0700 Subject: [PATCH 18/25] code formatting changes --- styles/japanesewithanime.com/catppuccin.user.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css index 987b437789..6a71f13b23 100644 --- a/styles/japanesewithanime.com/catppuccin.user.css +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -78,6 +78,8 @@ .set-colors(); + + color-scheme: if(@lookup = latte, light, dark); ::selection { From 43eaac5a5cb4b711a61c300ee364ad3980607ea8 Mon Sep 17 00:00:00 2001 From: BPplays Date: Sat, 25 May 2024 18:34:34 -0700 Subject: [PATCH 19/25] fixed linting errors --- .../japanesewithanime.com/catppuccin.user.css | 70 +++++++++---------- 1 file changed, 32 insertions(+), 38 deletions(-) diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css index 6a71f13b23..21c51b1f8c 100644 --- a/styles/japanesewithanime.com/catppuccin.user.css +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -139,10 +139,7 @@ border-color: @overlay1 !important; border-radius: 2px !important; border-width: 1px !important; - padding-bottom: 1.8px !important; - padding-left: 6.6px !important; - padding-right: 6.6px !important; - padding-top: 1.8px !important; + padding: 1.8px 6.6px !important; border-style: solid !important; background-color: @surface1 !important; } @@ -225,16 +222,44 @@ .megaNav__Particles > a, .megaNav__Symbols > a { background-color: @surface0 !important; } + .post-donation-cta{ + color: @text !important; + background-color: @surface0 !important; + } + #archive-year-select, + #archive-month-select{ + color: @text !important; + background-color: @surface0 !important; + } + & when (@solidColors = 1) { .megaNav__Particles > a, .megaNav__Symbols > a { border-color: @surface0 !important; border-radius: 1px !important; } + .post-donation-cta { + border-color: @surface0 !important; + border-radius:1px !important; + } + #archive-year-select, + #archive-month-select{ + border-color: @surface0 !important; + border-radius:1px !important; + } } + & when (@solidColors = 0) { .megaNav__Particles > a, .megaNav__Symbols > a { border-color: @accent-color !important; } + .post-donation-cta { + border-color: @accent-color !important; + } + #archive-year-select, + #archive-month-select{ + border-color: @surface2 !important; + border-radius:1px !important; + } } @@ -280,22 +305,8 @@ border-color: @surface0 !important; } - .post-donation-cta{ - color: @text !important; - background-color: @surface0 !important; - } - & when (@solidColors = 1) { - .post-donation-cta { - border-color: @surface0 !important; - border-radius:1px !important; - } - } - & when (@solidColors = 0) { - .post-donation-cta { - border-color: @accent-color !important; - } - } + .my-breadcrumb-path{ background-color: @base !important; @@ -310,26 +321,9 @@ } - #archive-year-select, - #archive-month-select{ - color: @text !important; - background-color: @surface0 !important; - } - & when (@solidColors = 1) { - #archive-year-select, - #archive-month-select{ - border-color: @surface0 !important; - border-radius:1px !important; - } - } - & when (@solidColors = 0) { - #archive-year-select, - #archive-month-select{ - border-color: @surface2 !important; - border-radius:1px !important; - } - } + + .readership-survey-notice h2{ color: @text !important; From 7c8c2792530d0469a621e0af99f18c16b5affb57 Mon Sep 17 00:00:00 2001 From: BPplays Date: Mon, 26 Aug 2024 19:15:42 -0700 Subject: [PATCH 20/25] removed unneeded style options --- .../japanesewithanime.com/catppuccin.user.css | 124 +++++++----------- 1 file changed, 45 insertions(+), 79 deletions(-) diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css index 21c51b1f8c..b64fd0797f 100644 --- a/styles/japanesewithanime.com/catppuccin.user.css +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -14,8 +14,6 @@ @var select darkFlavor "Dark Flavor" ["latte:Latte", "frappe:Frappé", "macchiato:Macchiato", "mocha:Mocha*"] @var select accentColor "Accent" ["rosewater:Rosewater", "flamingo:Flamingo", "pink:Pink", "mauve:Mauve", "red:Red*", "maroon:Maroon", "peach:Peach", "yellow:Yellow", "green:Green", "teal:Teal", "blue:Blue", "sapphire:Sapphire", "sky:Sky", "lavender:Lavender", "subtext0:Gray"] @var select linkColor "Link color" ["rosewater:Rosewater", "flamingo:Flamingo", "pink:Pink", "mauve:Mauve", "red:Red", "maroon:Maroon", "peach:Peach", "yellow:Yellow", "green:Green", "teal:Teal", "blue:Blue*", "sapphire:Sapphire", "sky:Sky", "lavender:Lavender", "subtext0:Gray"] -@var checkbox solidColors "Prefer solid colors with no borders" 0 -@var checkbox ogBar "Original search bar" 0 ==/UserStyle== */ @-moz-document domain("japanesewithanime.com") { @@ -62,20 +60,20 @@ - .set-colors() when not (@accent-color = @yellow) and not (@link-color = @yellow) { - @warn-color: @yellow; - } - .set-colors() when (@accent-color = @yellow) or (@link-color = @yellow) { - @warn-color: @peach; - } - .set-colors() when (@accent-color = @peach) and (@link-color = @yellow) { - @warn-color: @maroon; - } - .set-colors() when (@accent-color = @yellow) and (@link-color = @peach) { - @warn-color: @maroon; - } + .set-colors() when not (@accent-color = @yellow) and not (@link-color = @yellow) { + @warn-color: @yellow; + } + .set-colors() when (@accent-color = @yellow) or (@link-color = @yellow) { + @warn-color: @peach; + } + .set-colors() when (@accent-color = @peach) and (@link-color = @yellow) { + @warn-color: @maroon; + } + .set-colors() when (@accent-color = @yellow) and (@link-color = @peach) { + @warn-color: @maroon; + } - .set-colors(); + .set-colors(); @@ -100,7 +98,7 @@ - #megaNav__contents{ + #megaNav__contents{ color: @text !important; background-color: @surface1 !important; } @@ -134,32 +132,17 @@ background-color: @surface0 !important; } - & when (@ogBar = 1) { - input.gsc-search-button{ - border-color: @overlay1 !important; - border-radius: 2px !important; - border-width: 1px !important; - padding: 1.8px 6.6px !important; - border-style: solid !important; - background-color: @surface1 !important; - } - input.gsc-input{ - border-color: @surface1 !important; - } - } - & when (@ogBar = 0) { - input.gsc-search-button{ - background-color: @surface1 !important; - border-color: @surface1 !important; - border-width: 1px !important; - border-style: solid !important; - border-radius: 1px !important; - } - input.gsc-input{ - border-color: @surface0 !important; - border-radius: 1px !important; - } - } + input.gsc-search-button{ + border-color: @overlay1 !important; + border-radius: 2px !important; + border-width: 1px !important; + padding: 1.8px 6.6px !important; + border-style: solid !important; + background-color: @surface1 !important; + } + input.gsc-input{ + border-color: @surface1 !important; + } @@ -177,7 +160,7 @@ #sidebar-divider{ border-left-color: @surface0 !important; border-left-width: 1px !important; - /* border-left-style: solid !important; */ + /* border-left-style: solid !important; */ } #myTopSearchFormInput{ @@ -196,16 +179,16 @@ .post-header-warning-nsfw{ color: @text !important; background-color: @surface0 !important; - border-color: @warn-color !important; - box-shadow: none !important; + border-color: @warn-color !important; + box-shadow: none !important; } .post-header-warning-wip{ color: @text !important; background-color: @surface0 !important; - border-color: @warn-color !important; - box-shadow: none !important; + border-color: @warn-color !important; + box-shadow: none !important; } @@ -215,11 +198,11 @@ color: @accent-color !important; } - .line-tags { + .line-tags { color: @subtext0 !important; } - .megaNav__Particles > a, .megaNav__Symbols > a { + .megaNav__Particles > a, .megaNav__Symbols > a { background-color: @surface0 !important; } .post-donation-cta{ @@ -232,41 +215,24 @@ background-color: @surface0 !important; } - & when (@solidColors = 1) { - .megaNav__Particles > a, .megaNav__Symbols > a { - border-color: @surface0 !important; - border-radius: 1px !important; - } - .post-donation-cta { - border-color: @surface0 !important; - border-radius:1px !important; - } - #archive-year-select, - #archive-month-select{ - border-color: @surface0 !important; - border-radius:1px !important; - } - } - - & when (@solidColors = 0) { - .megaNav__Particles > a, .megaNav__Symbols > a { - border-color: @accent-color !important; - } - .post-donation-cta { - border-color: @accent-color !important; - } - #archive-year-select, - #archive-month-select{ - border-color: @surface2 !important; - border-radius:1px !important; - } - } + + .megaNav__Particles > a, .megaNav__Symbols > a { + border-color: @accent-color !important; + } + .post-donation-cta { + border-color: @accent-color !important; + } + #archive-year-select, + #archive-month-select{ + border-color: @surface2 !important; + border-radius:1px !important; + } #jwa-header{ // background: fade(@red, 50%) !important; background: @surface0 !important; - border-bottom-width: 0 !important; + border-bottom-width: 0 !important; } From b68ea76af9cf6971d3d3438377f5c387781ca423 Mon Sep 17 00:00:00 2001 From: BPplays Date: Mon, 26 Aug 2024 20:11:46 -0700 Subject: [PATCH 21/25] added transcript-extra-color --- .../japanesewithanime.com/catppuccin.user.css | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css index b64fd0797f..0749c6c9d5 100644 --- a/styles/japanesewithanime.com/catppuccin.user.css +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -60,20 +60,38 @@ - .set-colors() when not (@accent-color = @yellow) and not (@link-color = @yellow) { + .set-warn-colors() when not (@accent-color = @yellow) and not (@link-color = @yellow) { @warn-color: @yellow; } - .set-colors() when (@accent-color = @yellow) or (@link-color = @yellow) { + .set-warn-colors() when (@accent-color = @yellow) or (@link-color = @yellow) { @warn-color: @peach; } - .set-colors() when (@accent-color = @peach) and (@link-color = @yellow) { + .set-warn-colors() when (@accent-color = @peach) and (@link-color = @yellow) { @warn-color: @maroon; } - .set-colors() when (@accent-color = @yellow) and (@link-color = @peach) { + .set-warn-colors() when (@accent-color = @yellow) and (@link-color = @peach) { @warn-color: @maroon; } - .set-colors(); + .set-warn-colors(); + + + + + .set-transcript-extra-color() when not (@accent-color = @green) and not (@link-color = @green) { + @transcript-extra-color: @green; + } + .set-transcript-extra-color() when (@accent-color = @green) or (@link-color = @green) { + @transcript-extra-color: @teal; + } + .set-transcript-extra-color() when (@accent-color = @teal) and (@link-color = @green) { + @transcript-extra-color: @mauve; + } + .set-transcript-extra-color() when (@accent-color = @green) and (@link-color = @teal) { + @transcript-extra-color: @mauve; + } + + .set-transcript-extra-color(); @@ -246,7 +264,7 @@ #blog-title, #blog-title>a, .date-header, - .widget .title, .widget>h2,{ + .widget .title, .widget>h2 { color: @text !important; } @@ -255,6 +273,11 @@ color: @subtext0 !important; } + :not(a).transcript-extra { + color: @transcript-extra-color !important; + } + + .visualNav > a{ color: transparent !important; } From eb181756cf188553ed28b4df397065f2d7d7ee5c Mon Sep 17 00:00:00 2001 From: BPplays Date: Mon, 26 Aug 2024 20:26:52 -0700 Subject: [PATCH 22/25] ran linter --- styles/japanesewithanime.com/catppuccin.user.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css index 0749c6c9d5..94f88077ab 100644 --- a/styles/japanesewithanime.com/catppuccin.user.css +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -12,7 +12,7 @@ @preprocessor less @var select lightFlavor "Light Flavor" ["latte:Latte*", "frappe:Frappé", "macchiato:Macchiato", "mocha:Mocha"] @var select darkFlavor "Dark Flavor" ["latte:Latte", "frappe:Frappé", "macchiato:Macchiato", "mocha:Mocha*"] -@var select accentColor "Accent" ["rosewater:Rosewater", "flamingo:Flamingo", "pink:Pink", "mauve:Mauve", "red:Red*", "maroon:Maroon", "peach:Peach", "yellow:Yellow", "green:Green", "teal:Teal", "blue:Blue", "sapphire:Sapphire", "sky:Sky", "lavender:Lavender", "subtext0:Gray"] +@var select accentColor "Accent" ["rosewater:Rosewater", "flamingo:Flamingo", "pink:Pink", "mauve:Mauve*", "red:Red", "maroon:Maroon", "peach:Peach", "yellow:Yellow", "green:Green", "teal:Teal", "blue:Blue", "sapphire:Sapphire", "sky:Sky", "lavender:Lavender", "subtext0:Gray"] @var select linkColor "Link color" ["rosewater:Rosewater", "flamingo:Flamingo", "pink:Pink", "mauve:Mauve", "red:Red", "maroon:Maroon", "peach:Peach", "yellow:Yellow", "green:Green", "teal:Teal", "blue:Blue*", "sapphire:Sapphire", "sky:Sky", "lavender:Lavender", "subtext0:Gray"] ==/UserStyle== */ From ea9c4e43f8a3012adca35d4673c05d98cdcf7372 Mon Sep 17 00:00:00 2001 From: BPplays Date: Mon, 26 Aug 2024 23:39:50 -0700 Subject: [PATCH 23/25] fixed parts like Poses & Gestures --- styles/japanesewithanime.com/catppuccin.user.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css index 94f88077ab..02e63a600e 100644 --- a/styles/japanesewithanime.com/catppuccin.user.css +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -150,6 +150,17 @@ background-color: @surface0 !important; } + .poses__link:hover .poses__label, .poses__link:focus .poses__label { + color: @link-color !important; + background-color: @surface0 !important; + outline-color: @link-color !important; + } + + .poses__link:hover::after, + .poses__link:focus::after { + border-color: @link-color; + } + input.gsc-search-button{ border-color: @overlay1 !important; border-radius: 2px !important; From ec6d9015c0f4bfe10f65f67244745e0370b213c5 Mon Sep 17 00:00:00 2001 From: BPplays Date: Tue, 27 Aug 2024 00:00:52 -0700 Subject: [PATCH 24/25] fixed / in subreddit links --- styles/japanesewithanime.com/catppuccin.user.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css index 02e63a600e..a4f61c7152 100644 --- a/styles/japanesewithanime.com/catppuccin.user.css +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -161,6 +161,12 @@ border-color: @link-color; } + + a[rel=external]::after, + a[rel=external]::before { + color: @accent-color; + } + input.gsc-search-button{ border-color: @overlay1 !important; border-radius: 2px !important; From c83d4804062b6fa223b0916c7e769ff7f4153167 Mon Sep 17 00:00:00 2001 From: BPplays Date: Tue, 27 Aug 2024 06:58:07 -0700 Subject: [PATCH 25/25] removed commented code --- styles/japanesewithanime.com/catppuccin.user.css | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/styles/japanesewithanime.com/catppuccin.user.css b/styles/japanesewithanime.com/catppuccin.user.css index a4f61c7152..c514c45a62 100644 --- a/styles/japanesewithanime.com/catppuccin.user.css +++ b/styles/japanesewithanime.com/catppuccin.user.css @@ -195,7 +195,6 @@ #sidebar-divider{ border-left-color: @surface0 !important; border-left-width: 1px !important; - /* border-left-style: solid !important; */ } #myTopSearchFormInput{ @@ -265,7 +264,6 @@ #jwa-header{ - // background: fade(@red, 50%) !important; background: @surface0 !important; border-bottom-width: 0 !important; } @@ -273,7 +271,6 @@ .megaNav__toptab, a.megaNav__toptab{ - // background: @red !important; background: @surface1 !important; color: @text !important; border-width: 0 !important; @@ -343,13 +340,6 @@ border-width: 0 !important; } - // .T4LgNb, - // .kFwPee, - // c-wiz{ - // color: @text !important; - // background-color: @base !important; - // } - .x5vlw, .kFwPee, .Pc9Gce,