From 5bb9d9420bf7c197d9704c2ee23e223fac9829d9 Mon Sep 17 00:00:00 2001 From: soya_daizu Date: Sat, 29 Jul 2023 02:37:01 +0900 Subject: [PATCH] fix(proton): lighten colors on latte (#148) --- styles/proton/catppuccin.user.css | 36 ++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/styles/proton/catppuccin.user.css b/styles/proton/catppuccin.user.css index b2fa4b7..7b33aad 100644 --- a/styles/proton/catppuccin.user.css +++ b/styles/proton/catppuccin.user.css @@ -165,42 +165,52 @@ &, .ui-prominent, .ui-standard { + .lightenOrDarken(@color, @value) { + @result: if( + @flavor=latte, + lighten(@color, @value), + darken(@color, @value) + ); + } + --primary: @accent-Color; --primary-contrast: @mantle; - --signal-danger-minor-2: darken(@maroon, 50%); - --signal-danger-minor-1: darken(@maroon, 30%); + --signal-danger-minor-2: .lightenOrDarken(@maroon, 40%) [ @result]; + --signal-danger-minor-1: .lightenOrDarken(@maroon, 30%) [ @result]; --signal-danger: @maroon; --signal-danger-major-1: saturate(@maroon, 40%); --signal-danger-major-2: saturate(@maroon, 30%); --signal-danger-major-3: saturate(@maroon, 20%); --signal-danger-contrast: @mantle; - --signal-warning-minor-2: darken(@peach, 50%); - --signal-warning-minor-1: darken(@peach, 30%); + --signal-warning-minor-2: .lightenOrDarken(@peach, 40%) [ @result]; + --signal-warning-minor-1: .lightenOrDarken(@peach, 30%) [ @result]; --signal-warning: @peach; --signal-warning-major-1: saturate(@peach, 40%); --signal-warning-major-2: saturate(@peach, 30%); --signal-warning-major-3: saturate(@peach, 20%); --signal-warning-contrast: @mantle; - --signal-success-minor-2: darken(@green, 50%); - --signal-success-minor-1: darken(@green, 30%); + --signal-success-minor-2: .lightenOrDarken(@green, 40%) [ @result]; + --signal-success-minor-1: .lightenOrDarken(@green, 30%) [ @result]; --signal-success: @green; --signal-success-major-1: saturate(@green, 40%); --signal-success-major-2: saturate(@green, 30%); --signal-success-major-3: saturate(@green, 20%); --signal-success-contrast: @mantle; - --signal-info-minor-2: darken(@blue, 50%); - --signal-info-minor-1: darken(@blue, 30%); + --signal-info-minor-2: .lightenOrDarken(@blue, 40%) [ @result]; + --signal-info-minor-1: .lightenOrDarken(@blue, 30%) [ @result]; --signal-info: @blue; --signal-info-major-1: saturate(@blue, 40%); --signal-info-major-2: saturate(@blue, 30%); --signal-info-major-3: saturate(@blue, 20%); --signal-info-contrast: @mantle; - --interaction-norm-minor-2: darken(@accent-Color, 50%); - --interaction-norm-minor-1: darken(@accent-Color, 30%); + --interaction-norm-minor-2: .lightenOrDarken(@accent-Color, 40%) [ + @result]; + --interaction-norm-minor-1: .lightenOrDarken(@accent-Color, 30%) [ + @result]; --interaction-norm: @accent-Color; - --interaction-norm-major-1: lighten(@accent-Color, 30%); - --interaction-norm-major-2: lighten(@accent-Color, 20%); - --interaction-norm-major-3: lighten(@accent-Color, 10%); + --interaction-norm-major-1: saturate(@accent-Color, 30%); + --interaction-norm-major-2: saturate(@accent-Color, 20%); + --interaction-norm-major-3: saturate(@accent-Color, 10%); --interaction-norm-contrast: @mantle; --interaction-weak-minor-2: darken(@overlay0, 50%); --interaction-weak-minor-1: darken(@overlay0, 30%);