Update gtk4 theme (mamolinux#60)

- Add sucharu specific modifications - Rebase from mint-y theme
hsbasu · Oct 27, 2023 · bfe8b42 · bfe8b42
1 parent a842c0d
commit bfe8b42
Show file tree

Hide file tree

Showing 10 changed files with 1,948 additions and 1,203 deletions.
diff --git a/gtk/src/default/gtk-4.0/gtk-dark.scss b/gtk/src/default/gtk-4.0/gtk-dark.scss
@@ -5,4 +5,5 @@ $darker: 'false';
 @import 'sass/colors';
 @import 'sass/drawing';
 @import 'sass/common';
-@import 'sass/colors-public';
+@import 'sass/colors-public';
+@import 'sass/tweaks';
diff --git a/gtk/src/default/gtk-4.0/gtk-darker.scss b/gtk/src/default/gtk-4.0/gtk-darker.scss
@@ -1,8 +1,9 @@
 $variant: 'light';
-$darker: 'true';
 $tint: 'no-tint';
+$darker: 'true';
 
 @import 'sass/colors';
 @import 'sass/drawing';
 @import 'sass/common';
 @import 'sass/colors-public';
+@import 'sass/tweaks';
diff --git a/gtk/src/default/gtk-4.0/gtk.scss b/gtk/src/default/gtk-4.0/gtk.scss
@@ -5,4 +5,5 @@ $darker: 'false';
 @import 'sass/colors';
 @import 'sass/drawing';
 @import 'sass/common';
-@import 'sass/colors-public';
+@import 'sass/colors-public';
+@import 'sass/tweaks';
diff --git a/gtk/src/default/gtk-4.0/sass/_colors-public.scss b/gtk/src/default/gtk-4.0/sass/_colors-public.scss
@@ -44,3 +44,21 @@ $wm_bg_unfocused: opacify($header_bg_backdrop, 1);
 @define-color wm_border #{"" + $wm_border};
 @define-color wm_border_unfocused #{"" + $wm_border_unfocused};
 @define-color wm_shadow alpha(#{"" + black}, 0.35);
+
+// //WM Buttons
+
+// // Close
+// @define-color wm_button_close_bg #{"" + $wm_button_close_bg};
+// @define-color wm_button_close_hover_bg #{"" + $wm_button_close_hover_bg};
+// @define-color wm_button_close_active_bg #{"" + $wm_button_close_active_bg};
+
+// @define-color wm_icon_close_bg #{"" + $wm_icon_close_bg};
+
+// // Minimize, Maximize
+// @define-color wm_button_hover_bg #{"" + $wm_button_hover_bg};
+// @define-color wm_button_active_bg #{"" + $wm_button_active_bg};
+
+// @define-color wm_icon_bg #{"" + $wm_icon_bg};
+// @define-color wm_icon_unfocused_bg #{"" + $wm_icon_unfocused_bg};
+// @define-color wm_icon_hover_bg #{"" + $wm_icon_hover_bg};
+// @define-color wm_icon_active_bg #{"" + $wm_icon_active_bg};
diff --git a/gtk/src/default/gtk-4.0/sass/_colors.scss b/gtk/src/default/gtk-4.0/sass/_colors.scss
@@ -4,66 +4,63 @@
 // We need to set this first because we use it to tint many
 // of the remaining colors
 
-$light_tint: if($tint == 'tint', mix(#92b372, #f5f5f5, 2%), #f5f5f5);
-$dark_tint: if($tint == 'tint', mix(#8fa876, #404040, 2%), #404040);
+$light_tint: if($tint == 'tint', mix(#35a854, #f5f5f5, 2%), #f5f5f5);
+$dark_tint: if($tint == 'tint', mix(#35a854, #383838, 2%), #383838);
 
 $base_color: if($variant == 'light', #ffffff, #404040);
-$text_color: if($variant == 'light', #101010, #dadada);
+$text_color: if($variant == 'light', #303030, #DADADA);
 $bg_color: if($variant == 'light', $light_tint, $dark_tint);
-$fg_color: if($variant == 'light', transparentize(#101010, 0.13), transparentize(#ffffff, 0.13));
+$fg_color: if($variant =='light', transparentize(black, 0.13), transparentize(white, 0.13));
 
-$selected_bg_color: if($variant == 'light', #92b372, #8fa876);
+$selected_bg_color: if($variant == 'light', #35a854, #35a854);
 $selected_fg_color: #ffffff;
 $selected_borders_color: darken($selected_bg_color, 15%);
-$borders_color: if($variant == 'light', darken($bg_color, 18%), darken($bg_color,6%));
-$separator_color: if($variant == 'light', #dfdfdf, darken($bg_color, 6%));
+$borders_color: if($variant =='light', darken($bg_color, 18%), darken($bg_color,6%));
+$separator_color: if($variant == 'light', #DFDFDF, darken($bg_color, 6%));
 
-$link_color: #5294e2;
-$link_visited_color: #5294e2;
+$link_color: #5294E2;
+$link_visited_color: #5294E2;
 
 $selection_mode_bg: $selected_bg_color;
 $selection_mode_fg: $selected_fg_color;
 $warning_color: #f27835;
 $warning_fg_color: white;
-$error_color: #fc4138;
+$error_color: #FC4138;
 $error_fg_color: white;
 $success_color: #73d216;
-$destructive_color: #f04a50;
+$destructive_color: #F04A50;
 $suggested_color: #6db442;
 $question_color: #55c1ec;
 
 $drop_target_color: $selected_bg_color;
 
-// insensitive state derived colors
+//insensitive state derived colors
 $insensitive_fg_color: transparentize($fg_color, 0.45);
 $insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), lighten($bg_color, 2%));
 
 $dim_label_fg_color: transparentize($fg_color, 0.35);
 
-$header_bg: if($variant == 'light' and $darker == 'false', darken($bg_color, 9%), darken($bg_color, 5%));
-$header_bg: if($darker == 'true', $dark_tint, $header_bg);
-$header_bg_backdrop: if($variant == 'dark' or $darker == 'true', lighten($header_bg, 2.5%), lighten($header_bg, 5%));
+$header_bg: if($variant == 'light', darken($bg_color, 5%), darken($bg_color, 5%));
+$header_bg_backdrop: if($variant == 'dark', lighten($header_bg, 1.5%), lighten($header_bg, 3%));
 
-$header_border: if($variant == 'light' and $darker=='false', #d0d0d0, darken($header_bg, 4%));
-$header_highlight: if($variant == 'light', #eeeeee, #373737);
+$header_border: if($variant == 'light', #BDBDBD, darken($header_bg, 4%));
+$header_highlight: if($variant == 'light', #EEEEEE, #373737);
 
-$header_fg: if($darker == 'false', $fg_color, saturate(transparentize(#f0f0f0, 0.13), 10%));
+$header_fg: $fg_color;
 
-$menu_selected_bg_color: $selected_bg_color;
-$menu_selected_fg_color: $selected_fg_color;
+$menu_selected_bg_color: if($variant == 'light', transparentize(black, 0.9), transparentize(white, 0.9));
 
-$dark_sidebar_bg: if($variant == 'light' and $darker == 'false', saturate(darken($bg_color, 19%), 5%), #292929);
-$dark_sidebar_fg: $header_fg;
+$dark_sidebar_bg: if($variant == 'light', saturate(darken($bg_color, 1%), 5%), #353535);
+$dark_sidebar_fg: $fg_color;
 $dark_sidebar_border: $borders_color;
 
 $filechooser_bg: $header_bg;
 
-$tooltip_bg_color: #fbeaa0;
-$tooltip_fg_color: #4a4a4a;
-$tooltip_border_color: #d0d0d0;
+$tooltip_bg_color: transparentize(mix($selected_bg_color, black, 95%), 0.05);
+$tooltip_fg_color: $selected_fg_color;
 
-$osd_fg_color: $dark_sidebar_fg;
-$osd_bg_color: $dark_sidebar_bg;
+$osd_fg_color: #dbdbdb;
+$osd_bg_color: if($variant == 'light', #404040, #353535);
 
 $osd_button_bg: transparentize(lighten($osd_bg_color, 22%), 0.6);
 $osd_button_border: transparentize(darken($osd_bg_color, 12%), 0.6);
@@ -75,34 +72,30 @@ $osd_insensitive_bg_color: darken($osd_bg_color, 3%);
 $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 30%);
 $osd_borders_color: transparentize(black, 0.3);
 
-$panel_bg: if($variant == 'light' and $darker == 'false', #cccccc, #353535);
-$panel_fg: if($variant == 'light' and $darker == 'false', #404040, #dbdbdb);
-
-// Panel colors
-$panel_bg_panel: if($variant == 'light' and $darker == 'false', yellow, DarkGreen);
+$panel_bg: #2f2f2f;
+$panel_fg: #DADADA;
 
 $entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%));
-$entry_border: if($variant == 'light', #bababa, darken($borders_color, 0%));
+$entry_border: if($variant == 'light', #BABABA, darken($borders_color, 0%));
 
-$header_entry_bg: if($variant == 'dark' or $darker == 'true', transparentize(lighten($header_bg, 22%), 0.6), transparentize($base_color, 0.1));
-$header_entry_border: if($variant == 'dark' or $darker == 'true', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7));
+$header_entry_bg: if($variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($base_color, 0.1));
+$header_entry_border: if($variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7));
 
 $button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%));
 $button_border: $borders_color;
-$button_active_bg: $selected_bg_color;
-// $button_active_bg: darken(transparentize($header_bg, 10%));
+$button_active_bg: transparentize(black, 0.85);
 $button_active_border: darken($button_border, 10%);
 
-$header_button_bg: if($variant == 'dark' or $darker == 'true', transparentize(lighten($header_bg, 22%), 0.6), transparentize($button_bg, 0.1));
-$header_button_border: if($variant == 'dark' or $darker == 'true', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7));
+$header_button_bg: if($variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($button_bg, 0.1));
+$header_button_border: if($variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7));
 
 $trough_color_treeview: if($variant == 'light', #d9d9d9, darken($bg_color, 5%));
 $trough_color: if($variant == 'light', #ffffff, darken($bg_color, 5%));
 
 // WM Colors
 
-$wm_title: if($variant == 'light' and $darker =='false', $fg_color, #e6e6e6);
-$wm_title_unfocused: if($variant == 'light' and $darker =='false', #808080, #bfbfbf);
+$wm_title: if($variant == 'light', #404040, $fg_color);
+$wm_title_unfocused: if($variant == 'light', #9d9d9d, #a7a7a7);
 $wm_bg: $header_bg;
 $wm_bg_unfocused: $header_bg;
 $wm_highlight: $header_highlight;
@@ -125,8 +118,4 @@ $wm_button_active_bg: if($variant == 'light', #909090, #949494);
 $wm_icon_bg: if($variant == 'light', #404040, #909090);
 $wm_icon_unfocused_bg: if($variant == 'light', #b6b6b6, #555555);
 $wm_icon_hover_bg: if($variant == 'light', #404040, #C4C7CC);
-$wm_icon_active_bg: #ffffff;
-
-// terminal colours
-$terminal_bg: if($variant == 'light', #fdf6e3, #380c0c);
-$terminal_fg: if($variant == 'light', #2e3436, #d3d3d3);
+$wm_icon_active_bg: #ffffff