From 72fb16eb1c8c1fe9542f79aa39aeed5e189ae296 Mon Sep 17 00:00:00 2001 From: Lukasz Czajka Date: Tue, 12 Nov 2024 16:27:57 +0100 Subject: [PATCH 1/4] make the light theme lighter --- assets/css/latte.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/css/latte.css b/assets/css/latte.css index 78724be1fa..abd6c9c6db 100644 --- a/assets/css/latte.css +++ b/assets/css/latte.css @@ -24,7 +24,7 @@ --ctp-surface2: #acb0be; --ctp-surface1: #bcc0cc; --ctp-surface0: #ccd0da; - --ctp-base: #eff1f5; - --ctp-mantle: #e6e9ef; + --ctp-base: #f5f7f9; + --ctp-mantle: #eaedf3; --ctp-crust: #dce0e8; } From 0868fa70b1b630b0236fc59dba185f920e33144f Mon Sep 17 00:00:00 2001 From: Lukasz Czajka Date: Tue, 12 Nov 2024 16:34:32 +0100 Subject: [PATCH 2/4] make the light theme lighter --- assets/css/latte.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/latte.css b/assets/css/latte.css index abd6c9c6db..6b334241be 100644 --- a/assets/css/latte.css +++ b/assets/css/latte.css @@ -24,7 +24,7 @@ --ctp-surface2: #acb0be; --ctp-surface1: #bcc0cc; --ctp-surface0: #ccd0da; - --ctp-base: #f5f7f9; + --ctp-base: #fafcff; --ctp-mantle: #eaedf3; --ctp-crust: #dce0e8; } From b560afce38cde0b1ccef3f25434fab1d2db067b0 Mon Sep 17 00:00:00 2001 From: Lukasz Czajka Date: Tue, 12 Nov 2024 16:41:02 +0100 Subject: [PATCH 3/4] background color --- assets/css/latte.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/latte.css b/assets/css/latte.css index 6b334241be..5fad502287 100644 --- a/assets/css/latte.css +++ b/assets/css/latte.css @@ -24,7 +24,7 @@ --ctp-surface2: #acb0be; --ctp-surface1: #bcc0cc; --ctp-surface0: #ccd0da; - --ctp-base: #fafcff; + --ctp-base: #f9fafd; --ctp-mantle: #eaedf3; --ctp-crust: #dce0e8; } From 030621eed0bd554b1ad1c283acceae3a2d37e4f0 Mon Sep 17 00:00:00 2001 From: Lukasz Czajka Date: Fri, 15 Nov 2024 17:00:24 +0100 Subject: [PATCH 4/4] add latte-light.css --- app/Commands/Html/Options.hs | 2 +- assets/css/latte-light.css | 30 +++++++++++++++++++ assets/css/latte.css | 4 +-- .../Compiler/Backend/Html/Data/Options.hs | 3 ++ src/Juvix/Compiler/Backend/Html/Extra.hs | 5 ++++ 5 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 assets/css/latte-light.css diff --git a/app/Commands/Html/Options.hs b/app/Commands/Html/Options.hs index 409fa270c4..1796e162bd 100644 --- a/app/Commands/Html/Options.hs +++ b/app/Commands/Html/Options.hs @@ -47,7 +47,7 @@ parseHtml = do (eitherReader parseTheme) ( long "theme" <> metavar "THEME" - <> value Latte + <> value LatteLight <> showDefault <> help ("Theme for syntax highlighting. " <> availableStr) <> completeWith (map show allThemes) diff --git a/assets/css/latte-light.css b/assets/css/latte-light.css new file mode 100644 index 0000000000..b7581fd5a0 --- /dev/null +++ b/assets/css/latte-light.css @@ -0,0 +1,30 @@ +/* Lighter version of the latte color palette based on https://github.com/catppuccin/catppuccin#-palette */ + +:root { + --ctp-rosewater: #dc8a78; + --ctp-flamingo: #dd7878; + --ctp-pink: #ea76cb; + --ctp-mauve: #8839ef; + --ctp-red: #d20f39; + --ctp-maroon: #e64553; + --ctp-peach: #fe640b; + --ctp-yellow: #df8e1d; + --ctp-green: #40a02b; + --ctp-teal: #179299; + --ctp-sky: #04a5e5; + --ctp-sapphire: #209fb5; + --ctp-blue: #1e66f5; + --ctp-lavender: #7287fd; + --ctp-text: #4c4f69; + --ctp-subtext1: #5c5f77; + --ctp-subtext0: #6c6f85; + --ctp-overlay2: #7c7f93; + --ctp-overlay1: #8c8fa1; + --ctp-overlay0: #9ca0b0; + --ctp-surface2: #acb0be; + --ctp-surface1: #bcc0cc; + --ctp-surface0: #ccd0da; + --ctp-base: #fbfcff; + --ctp-mantle: #f0f3f9; + --ctp-crust: #dce0e8; +} diff --git a/assets/css/latte.css b/assets/css/latte.css index 5fad502287..78724be1fa 100644 --- a/assets/css/latte.css +++ b/assets/css/latte.css @@ -24,7 +24,7 @@ --ctp-surface2: #acb0be; --ctp-surface1: #bcc0cc; --ctp-surface0: #ccd0da; - --ctp-base: #f9fafd; - --ctp-mantle: #eaedf3; + --ctp-base: #eff1f5; + --ctp-mantle: #e6e9ef; --ctp-crust: #dce0e8; } diff --git a/src/Juvix/Compiler/Backend/Html/Data/Options.hs b/src/Juvix/Compiler/Backend/Html/Data/Options.hs index fa921a9b94..e269eb0fa3 100644 --- a/src/Juvix/Compiler/Backend/Html/Data/Options.hs +++ b/src/Juvix/Compiler/Backend/Html/Data/Options.hs @@ -40,6 +40,7 @@ defaultHtmlOptions = data Theme = Nord | Macchiato + | LatteLight | Latte | Frappe | Mocha @@ -49,6 +50,7 @@ instance Show Theme where show = \case Nord -> "nord" Macchiato -> "macchiato" + LatteLight -> "latte-light" Latte -> "latte" Frappe -> "frappe" Mocha -> "mocha" @@ -62,6 +64,7 @@ themeLight :: Theme -> ThemeLight themeLight = \case Nord -> Dark Macchiato -> Dark + LatteLight -> Light Latte -> Light Frappe -> Dark Mocha -> Dark diff --git a/src/Juvix/Compiler/Backend/Html/Extra.hs b/src/Juvix/Compiler/Backend/Html/Extra.hs index b19b37732a..320b9d2d44 100644 --- a/src/Juvix/Compiler/Backend/Html/Extra.hs +++ b/src/Juvix/Compiler/Backend/Html/Extra.hs @@ -69,6 +69,9 @@ juvixNordCss = cssLink "juvix-nord.css" nordCss :: (Members '[Reader HtmlOptions] r) => Sem r Html nordCss = cssLink "nord.css" +latteLightCss :: (Members '[Reader HtmlOptions] r) => Sem r Html +latteLightCss = cssLink "latte-light.css" + latteCss :: (Members '[Reader HtmlOptions] r) => Sem r Html latteCss = cssLink "latte.css" @@ -87,6 +90,7 @@ flavourCss = do case theme of Nord -> nordCss Macchiato -> macchiatoCss + LatteLight -> latteLightCss Latte -> latteCss Frappe -> frappeCss Mocha -> mochaCss @@ -97,6 +101,7 @@ themeCss = do case theme of Nord -> juvixNordCss Macchiato -> juvixCatppuchinCss + LatteLight -> juvixCatppuchinCss Latte -> juvixCatppuchinCss Frappe -> juvixCatppuchinCss Mocha -> juvixCatppuchinCss