From 7a0de931b935bbab09565c9c0a8fa286e04e2180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= <daniel@drasite.com>
Date: Mon, 20 Apr 2020 20:53:37 +0200
Subject: [PATCH] GTK3: kali theme tweaks for gtk 3.24.17

---
 share/themes/Kali-Dark/gtk-3.0/gtk.css        | 46 ++++++++++---------
 share/themes/Kali-Light/gtk-3.0/gtk-dark.css  | 46 ++++++++++---------
 share/themes/Kali-Light/gtk-3.0/gtk.css       |  2 +
 src/themes/Kali/sass/gtk-sass/_colors.scss    |  2 +-
 .../Kali/sass/gtk-sass/_common-tweaks.scss    |  4 ++
 5 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css
index e57a0462..55f392de 100644
--- a/share/themes/Kali-Dark/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css
@@ -2686,8 +2686,8 @@ switch {
   /* only show i / o for the accessible theme */ }
   switch:checked {
     color: #ffffff;
-    border-color: #00348d;
-    background-color: #5a97ff;
+    border-color: #00215a;
+    background-color: #2777ff;
     text-shadow: 0 1px rgba(0, 52, 141, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); }
   switch:disabled {
     color: #888a8d;
@@ -2702,7 +2702,7 @@ switch {
     transition: 200ms ease-out; }
     switch:backdrop:checked {
       border-color: #00348d;
-      background-color: #5a97ff; }
+      background-color: #2777ff; }
     switch:backdrop:disabled {
       color: #43495a;
       border-color: #111217;
@@ -2731,7 +2731,7 @@ switch {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.3), 0 1px 2px rgba(0, 0, 0, 0.27);
     background-image: linear-gradient(to bottom, #303340 20%, #272a34 90%); }
   switch:checked > slider {
-    border: 1px solid #00348d; }
+    border: 1px solid #00215a; }
   switch:disabled slider {
     color: #888a8d;
     border-color: #0d0e11;
@@ -2748,7 +2748,7 @@ switch {
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   switch:backdrop:checked > slider {
-    border-color: #00348d; }
+    border-color: #00215a; }
   switch:backdrop:disabled slider {
     color: #43495a;
     border-color: #111217;
@@ -2766,7 +2766,7 @@ switch {
   min-width: 32px;
   min-height: 32px;
   color: transparent;
-  background-color: #5a97ff;
+  background-color: #2777ff;
   border-radius: 5px;
   background-image: none;
   transition: 200ms;
@@ -2781,7 +2781,7 @@ switch {
   min-width: 32px;
   min-height: 32px;
   color: transparent;
-  background-color: #5a97ff;
+  background-color: #2777ff;
   border-radius: 5px;
   background-image: none;
   transition: 200ms;
@@ -2796,7 +2796,7 @@ switch {
   min-width: 32px;
   min-height: 32px;
   color: transparent;
-  background-color: #5a97ff;
+  background-color: #2777ff;
   border-radius: 5px;
   background-image: none;
   transition: 200ms;
@@ -2811,7 +2811,7 @@ switch {
   min-width: 32px;
   min-height: 32px;
   color: transparent;
-  background-color: #adadad;
+  background-color: #939393;
   border-radius: 5px;
   background-image: none;
   transition: 200ms;
@@ -2826,7 +2826,7 @@ switch {
   min-width: 32px;
   min-height: 32px;
   color: white;
-  background-color: #5a97ff;
+  background-color: #2777ff;
   border-radius: 5px;
   background-image: none;
   transition: 200ms;
@@ -2841,7 +2841,7 @@ switch {
   min-width: 32px;
   min-height: 32px;
   color: white;
-  background-color: #5a97ff;
+  background-color: #2777ff;
   border-radius: 5px;
   background-image: none;
   transition: 200ms;
@@ -2856,7 +2856,7 @@ switch {
   min-width: 32px;
   min-height: 32px;
   color: white;
-  background-color: #5a97ff;
+  background-color: #2777ff;
   border-radius: 5px;
   background-image: none;
   transition: 200ms;
@@ -2871,7 +2871,7 @@ switch {
   min-width: 32px;
   min-height: 32px;
   color: rgba(255, 255, 255, 0.8);
-  background-color: #adadad;
+  background-color: #939393;
   border-radius: 5px;
   background-image: none;
   transition: 200ms;
@@ -2933,13 +2933,13 @@ radio {
   check:checked,
   radio:checked {
     background-clip: border-box;
-    background-image: linear-gradient(to bottom, #74a7ff 20%, #5a97ff 90%);
-    border-color: #5a97ff;
+    background-image: linear-gradient(to bottom, #4187ff 20%, #2777ff 90%);
+    border-color: #2777ff;
     box-shadow: 0 1px rgba(0, 0, 0, 0.05);
     color: #ffffff; }
   check:checked:hover,
   radio:checked:hover {
-    background-image: linear-gradient(to bottom, #88b4ff 10%, #6ea4ff 90%); }
+    background-image: linear-gradient(to bottom, #5594ff 10%, #3b84ff 90%); }
   check:checked:active,
   radio:checked:active {
     box-shadow: inset 0 1px 1px 0px black; }
@@ -2949,7 +2949,7 @@ radio {
     color: rgba(255, 255, 255, 0.7); }
   check:checked:backdrop,
   radio:checked:backdrop {
-    background-image: image(#5a97ff);
+    background-image: image(#2777ff);
     box-shadow: none;
     color: #ffffff; }
   check:checked:backdrop:disabled,
@@ -2959,13 +2959,13 @@ radio {
   check:indeterminate,
   radio:indeterminate {
     background-clip: border-box;
-    background-image: linear-gradient(to bottom, #74a7ff 20%, #5a97ff 90%);
-    border-color: #5a97ff;
+    background-image: linear-gradient(to bottom, #4187ff 20%, #2777ff 90%);
+    border-color: #2777ff;
     box-shadow: 0 1px rgba(0, 0, 0, 0.05);
     color: #ffffff; }
   check:indeterminate:hover,
   radio:indeterminate:hover {
-    background-image: linear-gradient(to bottom, #88b4ff 10%, #6ea4ff 90%); }
+    background-image: linear-gradient(to bottom, #5594ff 10%, #3b84ff 90%); }
   check:indeterminate:active,
   radio:indeterminate:active {
     box-shadow: inset 0 1px 1px 0px black; }
@@ -2975,7 +2975,7 @@ radio {
     color: rgba(255, 255, 255, 0.7); }
   check:indeterminate:backdrop,
   radio:indeterminate:backdrop {
-    background-image: image(#5a97ff);
+    background-image: image(#2777ff);
     box-shadow: none;
     color: #ffffff; }
   check:indeterminate:backdrop:disabled,
@@ -4835,7 +4835,7 @@ radio:indeterminate, menu menuitem radio:checked, menu menuitem radio:indetermin
   check:checked:backdrop, check:indeterminate:backdrop, menu menuitem check:checked:backdrop, menu menuitem check:indeterminate:backdrop,
   radio:checked:backdrop,
   radio:indeterminate:backdrop, menu menuitem radio:checked:backdrop, menu menuitem radio:indeterminate:backdrop {
-    background-image: image(#5a97ff); }
+    background-image: image(#2777ff); }
 
 check:checked:disabled, check:indeterminate:disabled, menu menuitem check:checked:disabled, menu menuitem check:indeterminate:disabled,
 radio:checked:disabled,
@@ -5112,6 +5112,8 @@ decoration {
     border: 0; }
   messagedialog.csd decoration {
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(13, 14, 17, 0.65); }
+  window.csd decoration {
+    background: black; }
 
 button.titlebutton:not(.appmenu) {
   margin: 0; }
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 e57a0462..55f392de 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
@@ -2686,8 +2686,8 @@ switch {
   /* only show i / o for the accessible theme */ }
   switch:checked {
     color: #ffffff;
-    border-color: #00348d;
-    background-color: #5a97ff;
+    border-color: #00215a;
+    background-color: #2777ff;
     text-shadow: 0 1px rgba(0, 52, 141, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); }
   switch:disabled {
     color: #888a8d;
@@ -2702,7 +2702,7 @@ switch {
     transition: 200ms ease-out; }
     switch:backdrop:checked {
       border-color: #00348d;
-      background-color: #5a97ff; }
+      background-color: #2777ff; }
     switch:backdrop:disabled {
       color: #43495a;
       border-color: #111217;
@@ -2731,7 +2731,7 @@ switch {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.3), 0 1px 2px rgba(0, 0, 0, 0.27);
     background-image: linear-gradient(to bottom, #303340 20%, #272a34 90%); }
   switch:checked > slider {
-    border: 1px solid #00348d; }
+    border: 1px solid #00215a; }
   switch:disabled slider {
     color: #888a8d;
     border-color: #0d0e11;
@@ -2748,7 +2748,7 @@ switch {
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   switch:backdrop:checked > slider {
-    border-color: #00348d; }
+    border-color: #00215a; }
   switch:backdrop:disabled slider {
     color: #43495a;
     border-color: #111217;
@@ -2766,7 +2766,7 @@ switch {
   min-width: 32px;
   min-height: 32px;
   color: transparent;
-  background-color: #5a97ff;
+  background-color: #2777ff;
   border-radius: 5px;
   background-image: none;
   transition: 200ms;
@@ -2781,7 +2781,7 @@ switch {
   min-width: 32px;
   min-height: 32px;
   color: transparent;
-  background-color: #5a97ff;
+  background-color: #2777ff;
   border-radius: 5px;
   background-image: none;
   transition: 200ms;
@@ -2796,7 +2796,7 @@ switch {
   min-width: 32px;
   min-height: 32px;
   color: transparent;
-  background-color: #5a97ff;
+  background-color: #2777ff;
   border-radius: 5px;
   background-image: none;
   transition: 200ms;
@@ -2811,7 +2811,7 @@ switch {
   min-width: 32px;
   min-height: 32px;
   color: transparent;
-  background-color: #adadad;
+  background-color: #939393;
   border-radius: 5px;
   background-image: none;
   transition: 200ms;
@@ -2826,7 +2826,7 @@ switch {
   min-width: 32px;
   min-height: 32px;
   color: white;
-  background-color: #5a97ff;
+  background-color: #2777ff;
   border-radius: 5px;
   background-image: none;
   transition: 200ms;
@@ -2841,7 +2841,7 @@ switch {
   min-width: 32px;
   min-height: 32px;
   color: white;
-  background-color: #5a97ff;
+  background-color: #2777ff;
   border-radius: 5px;
   background-image: none;
   transition: 200ms;
@@ -2856,7 +2856,7 @@ switch {
   min-width: 32px;
   min-height: 32px;
   color: white;
-  background-color: #5a97ff;
+  background-color: #2777ff;
   border-radius: 5px;
   background-image: none;
   transition: 200ms;
@@ -2871,7 +2871,7 @@ switch {
   min-width: 32px;
   min-height: 32px;
   color: rgba(255, 255, 255, 0.8);
-  background-color: #adadad;
+  background-color: #939393;
   border-radius: 5px;
   background-image: none;
   transition: 200ms;
@@ -2933,13 +2933,13 @@ radio {
   check:checked,
   radio:checked {
     background-clip: border-box;
-    background-image: linear-gradient(to bottom, #74a7ff 20%, #5a97ff 90%);
-    border-color: #5a97ff;
+    background-image: linear-gradient(to bottom, #4187ff 20%, #2777ff 90%);
+    border-color: #2777ff;
     box-shadow: 0 1px rgba(0, 0, 0, 0.05);
     color: #ffffff; }
   check:checked:hover,
   radio:checked:hover {
-    background-image: linear-gradient(to bottom, #88b4ff 10%, #6ea4ff 90%); }
+    background-image: linear-gradient(to bottom, #5594ff 10%, #3b84ff 90%); }
   check:checked:active,
   radio:checked:active {
     box-shadow: inset 0 1px 1px 0px black; }
@@ -2949,7 +2949,7 @@ radio {
     color: rgba(255, 255, 255, 0.7); }
   check:checked:backdrop,
   radio:checked:backdrop {
-    background-image: image(#5a97ff);
+    background-image: image(#2777ff);
     box-shadow: none;
     color: #ffffff; }
   check:checked:backdrop:disabled,
@@ -2959,13 +2959,13 @@ radio {
   check:indeterminate,
   radio:indeterminate {
     background-clip: border-box;
-    background-image: linear-gradient(to bottom, #74a7ff 20%, #5a97ff 90%);
-    border-color: #5a97ff;
+    background-image: linear-gradient(to bottom, #4187ff 20%, #2777ff 90%);
+    border-color: #2777ff;
     box-shadow: 0 1px rgba(0, 0, 0, 0.05);
     color: #ffffff; }
   check:indeterminate:hover,
   radio:indeterminate:hover {
-    background-image: linear-gradient(to bottom, #88b4ff 10%, #6ea4ff 90%); }
+    background-image: linear-gradient(to bottom, #5594ff 10%, #3b84ff 90%); }
   check:indeterminate:active,
   radio:indeterminate:active {
     box-shadow: inset 0 1px 1px 0px black; }
@@ -2975,7 +2975,7 @@ radio {
     color: rgba(255, 255, 255, 0.7); }
   check:indeterminate:backdrop,
   radio:indeterminate:backdrop {
-    background-image: image(#5a97ff);
+    background-image: image(#2777ff);
     box-shadow: none;
     color: #ffffff; }
   check:indeterminate:backdrop:disabled,
@@ -4835,7 +4835,7 @@ radio:indeterminate, menu menuitem radio:checked, menu menuitem radio:indetermin
   check:checked:backdrop, check:indeterminate:backdrop, menu menuitem check:checked:backdrop, menu menuitem check:indeterminate:backdrop,
   radio:checked:backdrop,
   radio:indeterminate:backdrop, menu menuitem radio:checked:backdrop, menu menuitem radio:indeterminate:backdrop {
-    background-image: image(#5a97ff); }
+    background-image: image(#2777ff); }
 
 check:checked:disabled, check:indeterminate:disabled, menu menuitem check:checked:disabled, menu menuitem check:indeterminate:disabled,
 radio:checked:disabled,
@@ -5112,6 +5112,8 @@ decoration {
     border: 0; }
   messagedialog.csd decoration {
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(13, 14, 17, 0.65); }
+  window.csd decoration {
+    background: black; }
 
 button.titlebutton:not(.appmenu) {
   margin: 0; }
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css
index 65454cf5..8ee0d82b 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk.css
@@ -5134,6 +5134,8 @@ decoration {
     border: 0; }
   messagedialog.csd decoration {
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0); }
+  window.csd decoration {
+    background: white; }
 
 button.titlebutton:not(.appmenu) {
   margin: 0; }
diff --git a/src/themes/Kali/sass/gtk-sass/_colors.scss b/src/themes/Kali/sass/gtk-sass/_colors.scss
index b8ff4541..3d3bf418 100644
--- a/src/themes/Kali/sass/gtk-sass/_colors.scss
+++ b/src/themes/Kali/sass/gtk-sass/_colors.scss
@@ -74,6 +74,6 @@ $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: if($variant == 'light', $selected_bg_color, lighten($selected_bg_color,10%));
+$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%));
diff --git a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
index 07b5fcef..ba104c47 100644
--- a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
+++ b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
@@ -300,6 +300,10 @@ decoration {
     box-shadow: 0 1px 4px transparentize(black, 0.8),
                 0 0 0 1px transparentize($_wm_border, 0.1);
   }
+
+  window.csd & {
+   background: if($variant=='light', white, black);
+  }
 }
 
 // Window Close button