From cc2878cb6823f52e54e62593669913df3022a25f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= Date: Wed, 10 Apr 2024 10:57:01 +0200 Subject: [PATCH] Add new colors --- .../Kali-Purple/sass/gnome-shell-dark.scss | 1 - src/themes/Kali-Purple/sass/gnome-shell.scss | 1 - src/themes/Kali/sass/common/_colors.scss | 31 +++++++++++++------ src/themes/Kali/sass/gnome-shell-dark.scss | 1 - src/themes/Kali/sass/gnome-shell.scss | 1 - src/themes/Kali/sass/gtk3/_applications.scss | 8 ++--- src/themes/Kali/sass/gtk3/_budgie.scss | 6 ++-- 7 files changed, 29 insertions(+), 20 deletions(-) diff --git a/src/themes/Kali-Purple/sass/gnome-shell-dark.scss b/src/themes/Kali-Purple/sass/gnome-shell-dark.scss index 376223c6..610f6697 100644 --- a/src/themes/Kali-Purple/sass/gnome-shell-dark.scss +++ b/src/themes/Kali-Purple/sass/gnome-shell-dark.scss @@ -1,5 +1,4 @@ $variant: 'dark'; -$contrast: 'normal'; $selected_bg_color: #a400a4; $selected_fg_color: #ffffff; diff --git a/src/themes/Kali-Purple/sass/gnome-shell.scss b/src/themes/Kali-Purple/sass/gnome-shell.scss index 9b43b345..e292b41e 100644 --- a/src/themes/Kali-Purple/sass/gnome-shell.scss +++ b/src/themes/Kali-Purple/sass/gnome-shell.scss @@ -1,5 +1,4 @@ $variant: 'light'; -$contrast: 'normal'; $selected_bg_color: #a400a4; $selected_fg_color: #ffffff; diff --git a/src/themes/Kali/sass/common/_colors.scss b/src/themes/Kali/sass/common/_colors.scss index 9f6c7f96..e6d6a791 100644 --- a/src/themes/Kali/sass/common/_colors.scss +++ b/src/themes/Kali/sass/common/_colors.scss @@ -4,6 +4,9 @@ //@import '_palette.scss'; $is_highcontrast: false; +$contrast: 'normal'; + +$background_mix_factor: if($variant == 'light', 12%, 9%); // base color for light theme $_dark_base_color: #272a34; @@ -56,16 +59,19 @@ $osd_outer_borders_color: transparentize($osd_fg_color, 0.9); $sidebar_bg_color: mix($bg_color, $base_color, 50%); $base_hover_color: transparentize($fg_color, 0.95); -$panel_bg: transparentize($bg_color, if($variant=='light', 0.1, 0.2)); -$panel_fg: if($variant=='light', darken($fg_color, 10%), $fg_color); +// panel colors +$panel_bg_color: transparentize($bg_color, if($variant=='light', 0.1, 0.2)); +$panel_fg_color: if($variant=='light', darken($fg_color, 10%), $fg_color); + +// card elements +$card_bg_color: mix($fg_color, $bg_color, $background_mix_factor); +$card_shadow_color: transparent; +$card_shadow_border_color: $card_bg_color; $tooltip_borders_color: $osd_outer_borders_color; $shadow_color: transparentize(black, if($variant == 'light', 0.9, 0.7)); -// buttons -$button_mix_factor: if($variant == 'light', 10%, 9%); - // notifications $bubble_buttons_color: if($variant == 'light', darken($bg_color, 7%), lighten($bg_color, 5%)); @@ -116,19 +122,26 @@ $backdrop_menu_color: if($variant == 'light', $backdrop_base_color, mix($backdro //special cased widget colors $suggested_bg_color: $selected_bg_color; $suggested_border_color: $selected_borders_color; + $progress_bg_color: $selected_bg_color; $progress_border_color: $selected_borders_color; + $checkradio_bg_color: $selected_bg_color; $checkradio_fg_color: $selected_fg_color; $checkradio_borders_color: if($variant == 'light', darken($checkradio_bg_color,20%), darken($checkradio_bg_color,40%)); + $switch_bg_color: $selected_bg_color; $switch_borders_color: if($variant == 'light',darken($switch_bg_color,15%),darken($switch_bg_color,30%)); + +$focus_color: $selected_bg_color; $focus_border_color: if($variant == 'light', transparentize($selected_bg_color, 0.5), transparentize($selected_bg_color, 0.3)); + $alt_focus_border_color: if($variant == 'light', transparentize(white, 0.2), transparentize(white,0.7)); $dim_label_opacity: 0.55; // Gnome's color palette -$light_1: white; -$light_3: red; // not used after theme tweaks -$dark_5: black; -$orange_3: $warning_color; +$_base_color_light: #ffffff; +$light_1: #ffffff; +$orange_3: $warning_color; // privacy_indicator_color +$orange_4: $warning_color; // privacy_indicator_color +$red_4: $error_color; // recording_indicator_color diff --git a/src/themes/Kali/sass/gnome-shell-dark.scss b/src/themes/Kali/sass/gnome-shell-dark.scss index 6fa9dbc2..960b986e 100644 --- a/src/themes/Kali/sass/gnome-shell-dark.scss +++ b/src/themes/Kali/sass/gnome-shell-dark.scss @@ -1,5 +1,4 @@ $variant: 'dark'; -$contrast: 'normal'; @import "common/_colors"; //use gtk colors @import "gnome-shell/upstream/gnome-shell-sass/_drawing"; diff --git a/src/themes/Kali/sass/gnome-shell.scss b/src/themes/Kali/sass/gnome-shell.scss index c56c658c..2190e8bb 100644 --- a/src/themes/Kali/sass/gnome-shell.scss +++ b/src/themes/Kali/sass/gnome-shell.scss @@ -1,5 +1,4 @@ $variant: 'light'; -$contrast: 'normal'; @import "common/_colors"; //use gtk colors @import "gnome-shell/upstream/gnome-shell-sass/_drawing"; diff --git a/src/themes/Kali/sass/gtk3/_applications.scss b/src/themes/Kali/sass/gtk3/_applications.scss index b9ac620d..48fc4396 100644 --- a/src/themes/Kali/sass/gtk3/_applications.scss +++ b/src/themes/Kali/sass/gtk3/_applications.scss @@ -104,7 +104,7 @@ list.tweak-categories separator { /* XFCE4 PANEL */ .xfce4-panel { - &.background { background: $panel_bg; } + &.background { background: $panel_bg_color; } button { border: 0; @@ -113,7 +113,7 @@ list.tweak-categories separator { box-shadow: none; text-shadow: none; background: transparent; - color: $panel_fg; + color: $panel_fg_color; $_highlight_bg_color: if($variant=='light', $bg_color, rgba(black, .2)); @@ -212,7 +212,7 @@ wnck-pager { .lightdm-gtk-greeter { #panel_window { - background: $panel_bg; + background: $panel_bg_color; color: $fg_color; text-shadow: none; -gtk-icon-shadow: none; @@ -220,7 +220,7 @@ wnck-pager { #login_window { border: 0; - background-color: $panel_bg; + background-color: $panel_bg_color; border-radius: $button_radius; box-shadow: inset 0 1px transparentize(white, .85); diff --git a/src/themes/Kali/sass/gtk3/_budgie.scss b/src/themes/Kali/sass/gtk3/_budgie.scss index 6c47dd80..22ebf872 100644 --- a/src/themes/Kali/sass/gtk3/_budgie.scss +++ b/src/themes/Kali/sass/gtk3/_budgie.scss @@ -239,7 +239,7 @@ $z-depth-4: rgba(0, 0, 0, 0.34); // main menu styling .workspace-switcher { .workspace-layout { - border: 0 solid $panel_bg; + border: 0 solid $panel_bg_color; .top &, .bottom & { @@ -254,7 +254,7 @@ $z-depth-4: rgba(0, 0, 0, 0.34); .workspace-item, .workspace-add-button { - border: 0 solid darken($panel_bg, 5%); + border: 0 solid darken($panel_bg_color, 5%); .top &, .bottom & { @@ -269,7 +269,7 @@ $z-depth-4: rgba(0, 0, 0, 0.34); .workspace-item { - &.current-workspace { background-color: darken($panel_bg, 5%); } + &.current-workspace { background-color: darken($panel_bg_color, 5%); } } .workspace-add-button {