From 0f1cfd252142890eb7574737187dddfbf83c826a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= <daniruiz@kali.org>
Date: Mon, 17 May 2021 13:47:55 +0200
Subject: [PATCH] GTK3 & GTK4 tweaks

- Recover thunar's root-warning banner
- Reduce size of thunar's root-warning banner
- Move panel-background color to _colors.scss
- Lighten gtk4 button's color to match gtk3
- Use lighter color for tabs
---
 share/themes/Kali-Dark/gtk-3.0/gtk.css        |  7 ++-----
 share/themes/Kali-Dark/gtk-4.0/gtk.css        | 21 +++++++++----------
 share/themes/Kali-Light/gtk-3.0/gtk-dark.css  |  7 ++-----
 share/themes/Kali-Light/gtk-3.0/gtk.css       |  7 ++-----
 share/themes/Kali-Light/gtk-4.0/gtk-dark.css  | 21 +++++++++----------
 share/themes/Kali-Light/gtk-4.0/gtk.css       |  7 +++----
 src/themes/Kali/sass/common/_colors.scss      |  3 +++
 src/themes/Kali/sass/gtk3/_applications.scss  | 13 ++++--------
 src/themes/Kali/sass/gtk3/_common-tweaks.scss |  1 -
 src/themes/Kali/sass/gtk3/upstream/sync.sh    |  2 +-
 src/themes/Kali/sass/gtk4/_common-tweaks.scss |  1 -
 .../Kali/sass/gtk4/upstream/_drawing.scss     |  2 +-
 .../sass/gtk4/upstream/_drawing.scss.patch    |  2 +-
 13 files changed, 39 insertions(+), 55 deletions(-)

diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css
index 0d00ed3e..b1217b6b 100644
--- a/share/themes/Kali-Dark/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css
@@ -5277,8 +5277,7 @@ notebook > header {
         border-color: #0d0e11;
         border-bottom-color: black;
         background-image: image(#323643);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-        background: #272a34; }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
         notebook > header.top > tabs > tab:checked:backdrop,
         notebook > header.top > tabs > tab.reorderable-page:checked:backdrop, notebook > header.bottom > tabs > tab:checked:backdrop,
         notebook > header.bottom > tabs > tab.reorderable-page:checked:backdrop, notebook > header.left > tabs > tab:checked:backdrop,
@@ -5860,9 +5859,7 @@ wnck-pager {
 
 /* Thunar */
 .thunar .warning {
-  opacity: 0;
-  font-size: 0;
-  margin: -10px 0; }
+  margin: -7px 0; }
 
 /* GTK NAMED COLORS
    ----------------
diff --git a/share/themes/Kali-Dark/gtk-4.0/gtk.css b/share/themes/Kali-Dark/gtk-4.0/gtk.css
index b63f2e6e..a733322c 100644
--- a/share/themes/Kali-Dark/gtk-4.0/gtk.css
+++ b/share/themes/Kali-Dark/gtk-4.0/gtk.css
@@ -439,7 +439,7 @@ button {
   color: #eeeeec;
   outline-color: rgba(39, 119, 255, 0.7);
   border-color: #0d0e11;
-  background-image: image(#363a48);
+  background-image: image(#323643);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   notebook > header > tabs > arrow, windowcontrols button,
   button {
@@ -688,7 +688,7 @@ button.suggested-action {
   color: white;
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #0047c0;
-  background-image: image(#4b8eff);
+  background-image: image(#4187ff);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(0, 81, 218, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   
   button.suggested-action {
@@ -770,7 +770,7 @@ button.destructive-action {
   color: white;
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #4b0909;
-  background-image: image(#c61717);
+  background-image: image(#bd1616);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(98, 12, 12, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   
   button.destructive-action {
@@ -2094,7 +2094,7 @@ switch {
     color: #eeeeec;
     outline-color: rgba(39, 119, 255, 0.7);
     border-color: #0d0e11;
-    background-image: image(#363a48);
+    background-image: image(#323643);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     margin: -1px;
     min-width: 24px;
@@ -2452,7 +2452,7 @@ scale {
     color: #eeeeec;
     outline-color: rgba(39, 119, 255, 0.7);
     border-color: #0d0e11;
-    background-image: image(#363a48);
+    background-image: image(#323643);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     border-width: 1px;
     border-style: solid;
@@ -3523,7 +3523,7 @@ colorswatch {
       color: #eeeeec;
       outline-color: rgba(39, 119, 255, 0.7);
       border-color: #0d0e11;
-      background-image: image(#363a48);
+      background-image: image(#323643);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
     colorswatch#add-color-button.activatable:hover > overlay {
       color: #eeeeec;
@@ -3960,7 +3960,7 @@ scale slider {
   color: #eeeeec;
   outline-color: rgba(39, 119, 255, 0.7);
   border-color: #0d0e11;
-  background-image: image(#363a48);
+  background-image: image(#323643);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
   border-color: black; }
   switch:hover slider, switch slider:active,
@@ -4018,7 +4018,7 @@ treeview.view {
     color: #eeeeec;
     outline-color: rgba(39, 119, 255, 0.7);
     border-color: #0d0e11;
-    background-image: image(#363a48);
+    background-image: image(#323643);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     margin-left: -1px; }
     treeview.view header button:hover, treeview.view header button:active {
@@ -4071,9 +4071,8 @@ notebook > header {
         color: #eeeeec;
         outline-color: rgba(39, 119, 255, 0.7);
         border-color: #0d0e11;
-        background-image: image(#363a48);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-        background: #272a34; }
+        background-image: image(#323643);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
         notebook > header.top > tabs > tab:checked:backdrop,
         notebook > header.top > tabs > tab.reorderable-page:checked:backdrop, notebook > header.bottom > tabs > tab:checked:backdrop,
         notebook > header.bottom > tabs > tab.reorderable-page:checked:backdrop, notebook > header.left > tabs > tab:checked:backdrop,
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
index 0d00ed3e..b1217b6b 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
@@ -5277,8 +5277,7 @@ notebook > header {
         border-color: #0d0e11;
         border-bottom-color: black;
         background-image: image(#323643);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-        background: #272a34; }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
         notebook > header.top > tabs > tab:checked:backdrop,
         notebook > header.top > tabs > tab.reorderable-page:checked:backdrop, notebook > header.bottom > tabs > tab:checked:backdrop,
         notebook > header.bottom > tabs > tab.reorderable-page:checked:backdrop, notebook > header.left > tabs > tab:checked:backdrop,
@@ -5860,9 +5859,7 @@ wnck-pager {
 
 /* Thunar */
 .thunar .warning {
-  opacity: 0;
-  font-size: 0;
-  margin: -10px 0; }
+  margin: -7px 0; }
 
 /* GTK NAMED COLORS
    ----------------
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css
index 61e7fa90..a6be9db3 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk.css
@@ -5298,8 +5298,7 @@ notebook > header {
         border-color: #d9d9d9;
         border-bottom-color: #c2c2c2;
         background-image: image(white);
-        box-shadow: inset 0 1px white, inset 0 -1px 0px rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
-        background: #fafafa; }
+        box-shadow: inset 0 1px white, inset 0 -1px 0px rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
         notebook > header.top > tabs > tab:checked:backdrop,
         notebook > header.top > tabs > tab.reorderable-page:checked:backdrop, notebook > header.bottom > tabs > tab:checked:backdrop,
         notebook > header.bottom > tabs > tab.reorderable-page:checked:backdrop, notebook > header.left > tabs > tab:checked:backdrop,
@@ -5869,9 +5868,7 @@ wnck-pager {
 
 /* Thunar */
 .thunar .warning {
-  opacity: 0;
-  font-size: 0;
-  margin: -10px 0; }
+  margin: -7px 0; }
 
 /* GTK NAMED COLORS
    ----------------
diff --git a/share/themes/Kali-Light/gtk-4.0/gtk-dark.css b/share/themes/Kali-Light/gtk-4.0/gtk-dark.css
index b63f2e6e..a733322c 100644
--- a/share/themes/Kali-Light/gtk-4.0/gtk-dark.css
+++ b/share/themes/Kali-Light/gtk-4.0/gtk-dark.css
@@ -439,7 +439,7 @@ button {
   color: #eeeeec;
   outline-color: rgba(39, 119, 255, 0.7);
   border-color: #0d0e11;
-  background-image: image(#363a48);
+  background-image: image(#323643);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   notebook > header > tabs > arrow, windowcontrols button,
   button {
@@ -688,7 +688,7 @@ button.suggested-action {
   color: white;
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #0047c0;
-  background-image: image(#4b8eff);
+  background-image: image(#4187ff);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(0, 81, 218, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   
   button.suggested-action {
@@ -770,7 +770,7 @@ button.destructive-action {
   color: white;
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #4b0909;
-  background-image: image(#c61717);
+  background-image: image(#bd1616);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(98, 12, 12, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   
   button.destructive-action {
@@ -2094,7 +2094,7 @@ switch {
     color: #eeeeec;
     outline-color: rgba(39, 119, 255, 0.7);
     border-color: #0d0e11;
-    background-image: image(#363a48);
+    background-image: image(#323643);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     margin: -1px;
     min-width: 24px;
@@ -2452,7 +2452,7 @@ scale {
     color: #eeeeec;
     outline-color: rgba(39, 119, 255, 0.7);
     border-color: #0d0e11;
-    background-image: image(#363a48);
+    background-image: image(#323643);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     border-width: 1px;
     border-style: solid;
@@ -3523,7 +3523,7 @@ colorswatch {
       color: #eeeeec;
       outline-color: rgba(39, 119, 255, 0.7);
       border-color: #0d0e11;
-      background-image: image(#363a48);
+      background-image: image(#323643);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
     colorswatch#add-color-button.activatable:hover > overlay {
       color: #eeeeec;
@@ -3960,7 +3960,7 @@ scale slider {
   color: #eeeeec;
   outline-color: rgba(39, 119, 255, 0.7);
   border-color: #0d0e11;
-  background-image: image(#363a48);
+  background-image: image(#323643);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
   border-color: black; }
   switch:hover slider, switch slider:active,
@@ -4018,7 +4018,7 @@ treeview.view {
     color: #eeeeec;
     outline-color: rgba(39, 119, 255, 0.7);
     border-color: #0d0e11;
-    background-image: image(#363a48);
+    background-image: image(#323643);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     margin-left: -1px; }
     treeview.view header button:hover, treeview.view header button:active {
@@ -4071,9 +4071,8 @@ notebook > header {
         color: #eeeeec;
         outline-color: rgba(39, 119, 255, 0.7);
         border-color: #0d0e11;
-        background-image: image(#363a48);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-        background: #272a34; }
+        background-image: image(#323643);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
         notebook > header.top > tabs > tab:checked:backdrop,
         notebook > header.top > tabs > tab.reorderable-page:checked:backdrop, notebook > header.bottom > tabs > tab:checked:backdrop,
         notebook > header.bottom > tabs > tab.reorderable-page:checked:backdrop, notebook > header.left > tabs > tab:checked:backdrop,
diff --git a/share/themes/Kali-Light/gtk-4.0/gtk.css b/share/themes/Kali-Light/gtk-4.0/gtk.css
index 523ec466..e813fbf7 100644
--- a/share/themes/Kali-Light/gtk-4.0/gtk.css
+++ b/share/themes/Kali-Light/gtk-4.0/gtk.css
@@ -691,7 +691,7 @@ button.suggested-action {
   color: white;
   outline-color: rgba(255, 255, 255, 0.8);
   border-color: #0047c0;
-  background-image: image(#4b8eff);
+  background-image: image(#4187ff);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(0, 81, 218, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
   
   button.suggested-action {
@@ -773,7 +773,7 @@ button.destructive-action {
   color: white;
   outline-color: rgba(255, 255, 255, 0.8);
   border-color: #790e0e;
-  background-image: image(#e62b2b);
+  background-image: image(#e52222);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(144, 17, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
   
   button.destructive-action {
@@ -4090,8 +4090,7 @@ notebook > header {
         outline-color: rgba(39, 119, 255, 0.5);
         border-color: #d9d9d9;
         background-image: image(white);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
-        background: #fafafa; }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
         notebook > header.top > tabs > tab:checked:backdrop,
         notebook > header.top > tabs > tab.reorderable-page:checked:backdrop, notebook > header.bottom > tabs > tab:checked:backdrop,
         notebook > header.bottom > tabs > tab.reorderable-page:checked:backdrop, notebook > header.left > tabs > tab:checked:backdrop,
diff --git a/src/themes/Kali/sass/common/_colors.scss b/src/themes/Kali/sass/common/_colors.scss
index 948ab3a8..52a81a36 100644
--- a/src/themes/Kali/sass/common/_colors.scss
+++ b/src/themes/Kali/sass/common/_colors.scss
@@ -46,6 +46,9 @@ $osd_outer_borders_color: transparentize(white, 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);
+
 $tooltip_borders_color: $osd_outer_borders_color;
 $shadow_color: transparentize(black, if($variant == 'light', 0.9, 0.7));
 
diff --git a/src/themes/Kali/sass/gtk3/_applications.scss b/src/themes/Kali/sass/gtk3/_applications.scss
index 14f99abc..c7983f4e 100644
--- a/src/themes/Kali/sass/gtk3/_applications.scss
+++ b/src/themes/Kali/sass/gtk3/_applications.scss
@@ -1,5 +1,3 @@
-$panel_bg : transparentize($bg_color, if($variant=='light', .1, .2));
-
 /* Nautilus */
 @define-color disk_space_unknown #383c4a;
 @define-color disk_space_used #{"" +$selected_bg_color};
@@ -86,7 +84,7 @@ filechooser,
     box-shadow: none;
     text-shadow: none;
     background: transparent;
-    color: if($variant=='light', darken($fg_color, 10%), $fg_color);
+    color: $panel_fg;
 
     $_highlight_bg_color: if($variant=='light', $bg_color, rgba(black, .2));
 
@@ -220,9 +218,6 @@ wnck-pager {
 }
 
 /* Thunar */
-// Hide root user warning
-.thunar .warning {
-  opacity: 0;
-  font-size: 0;
-  margin: -10px 0;
-}
+// Reduce height of root user warning
+.thunar .warning { margin: -7px 0; }
+
diff --git a/src/themes/Kali/sass/gtk3/_common-tweaks.scss b/src/themes/Kali/sass/gtk3/_common-tweaks.scss
index 01f25616..e052f8d9 100644
--- a/src/themes/Kali/sass/gtk3/_common-tweaks.scss
+++ b/src/themes/Kali/sass/gtk3/_common-tweaks.scss
@@ -258,7 +258,6 @@ notebook {
 
           &:checked {
             @include button(normal);
-            background: $base_color;
 
             &:backdrop { @include button(backdrop); }
           }
diff --git a/src/themes/Kali/sass/gtk3/upstream/sync.sh b/src/themes/Kali/sass/gtk3/upstream/sync.sh
index 005eb280..d547380d 100755
--- a/src/themes/Kali/sass/gtk3/upstream/sync.sh
+++ b/src/themes/Kali/sass/gtk3/upstream/sync.sh
@@ -4,7 +4,7 @@ GREEN='\033[0;32m'
 YELLOW='\033[0;33m'
 RESET='\033[0m'
 
-VERSION=3.24.28
+VERSION=3.24.29
 
 echo
 printf " $YELLOW[ i ]$RESET Upstream version $VERSION\n"
diff --git a/src/themes/Kali/sass/gtk4/_common-tweaks.scss b/src/themes/Kali/sass/gtk4/_common-tweaks.scss
index 86137387..b6c5ff1f 100644
--- a/src/themes/Kali/sass/gtk4/_common-tweaks.scss
+++ b/src/themes/Kali/sass/gtk4/_common-tweaks.scss
@@ -284,7 +284,6 @@ notebook {
 
           &:checked {
             @include button(normal);
-            background: $base_color;
 
             &:backdrop {
               @include button(backdrop);
diff --git a/src/themes/Kali/sass/gtk4/upstream/_drawing.scss b/src/themes/Kali/sass/gtk4/upstream/_drawing.scss
index f3759a31..b9c8ca2a 100644
--- a/src/themes/Kali/sass/gtk4/upstream/_drawing.scss
+++ b/src/themes/Kali/sass/gtk4/upstream/_drawing.scss
@@ -133,7 +133,7 @@ $_default_button_c: lighten($bg_color,2%);
     color: $tc;
     outline-color: if($c != $_default_button_c, $alt_focus_border_color, $focus_border_color);
     border-color: if($c!=$_default_button_c, _border_color($c, true), $borders_color); //tint if not default button color
-    background-image: image(lighten($c, 7%));
+    background-image: image(lighten($c, 5%));
     @include _shadows($_button_shadow);
   }
 
diff --git a/src/themes/Kali/sass/gtk4/upstream/_drawing.scss.patch b/src/themes/Kali/sass/gtk4/upstream/_drawing.scss.patch
index 51261f62..69a0561f 100644
--- a/src/themes/Kali/sass/gtk4/upstream/_drawing.scss.patch
+++ b/src/themes/Kali/sass/gtk4/upstream/_drawing.scss.patch
@@ -8,4 +8,4 @@
 <     background-image: if($variant == 'light', linear-gradient(to top, darken($c, 2%) 2px, $c),
 <                                               linear-gradient(to top, darken($c,1%) 2px, $c));
 ---
->     background-image: image(lighten($c, 7%));
+>     background-image: image(lighten($c, 5%));