From 1402f9f62e745d99a62617d6e9d9101700c4b51a Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Thu, 21 Sep 2023 09:35:10 -0400 Subject: [PATCH 1/3] feat: theme select for light/dark mode --- styles/elk/catppuccin.user.css | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/styles/elk/catppuccin.user.css b/styles/elk/catppuccin.user.css index 8c669cb0d3..25c8728277 100644 --- a/styles/elk/catppuccin.user.css +++ b/styles/elk/catppuccin.user.css @@ -9,12 +9,16 @@ @license MIT @preprocessor less -@var select flavor "Flavor" ["latte:Latte", "frappe:Frappe", "macchiato:Macchiato", "mocha:Mocha*"] +@var select lightFlavor "Light Flavor" ["latte:Latte", "frappe:Frappe", "macchiato:Macchiato", "mocha:Mocha*"] +@var select darkFlavor "Dark Flavor" ["latte:Latte", "frappe:Frappe", "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("elk.zone") { - :root { - #catppuccin(@flavor, @accentColor); + :root[class="dark"] { + #catppuccin(@darkFlavor, @accentColor); + } + :root[class="light"] { + #catppuccin(@lightFlavor, @accentColor); } @catppuccin: { From ee6924c2d17d795f7529c93719bad29a9f626a83 Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Thu, 21 Sep 2023 09:41:37 -0400 Subject: [PATCH 2/3] fix: default light theme Co-authored-by: Isabel <71222764+isabelroses@users.noreply.github.com> --- styles/elk/catppuccin.user.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/elk/catppuccin.user.css b/styles/elk/catppuccin.user.css index 25c8728277..a832e3d69c 100644 --- a/styles/elk/catppuccin.user.css +++ b/styles/elk/catppuccin.user.css @@ -9,7 +9,7 @@ @license MIT @preprocessor less -@var select lightFlavor "Light Flavor" ["latte:Latte", "frappe:Frappe", "macchiato:Macchiato", "mocha:Mocha*"] +@var select lightFlavor "Light Flavor" ["latte:Latte*", "frappe:Frappe", "macchiato:Macchiato", "mocha:Mocha"] @var select darkFlavor "Dark Flavor" ["latte:Latte", "frappe:Frappe", "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== */ From e9488eb76280d8fb860e0fa263188ee0218c7102 Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Thu, 21 Sep 2023 09:44:04 -0400 Subject: [PATCH 3/3] refactor: use normal class selectors --- styles/elk/catppuccin.user.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/styles/elk/catppuccin.user.css b/styles/elk/catppuccin.user.css index a832e3d69c..0203ef309a 100644 --- a/styles/elk/catppuccin.user.css +++ b/styles/elk/catppuccin.user.css @@ -14,10 +14,10 @@ @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("elk.zone") { - :root[class="dark"] { + :root.dark { #catppuccin(@darkFlavor, @accentColor); } - :root[class="light"] { + :root.light { #catppuccin(@lightFlavor, @accentColor); }