GTK3: Update gtk->3.24.24 libhandy->1.0.3 & prepare for gtk4

share/themes/Kali-Dark/gtk-3.0/gtk.css

@@ -4739,41 +4739,33 @@ row.expander {
   row.expander image.expander-row-arrow:disabled {
     color: #888a8d; }
 
-flap > dimming,
 deck > dimming,
 leaflet > dimming {
   background: rgba(0, 0, 0, 0.24); }
 
-flap > border,
 deck > border,
 leaflet > border {
   min-width: 1px;
   min-height: 1px;
   background: #0d0e11; }
 
-flap > shadow,
 deck > shadow,
 leaflet > shadow {
   min-width: 56px;
   min-height: 56px; }
-  flap > shadow.left,
   deck > shadow.left,
   leaflet > shadow.left {
     background-image: linear-gradient(to right, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.02) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to right, rgba(0, 0, 0, 0.06), rgba(0, 0, 0, 0.02) 7px, rgba(0, 0, 0, 0) 24px); }
-  flap > shadow.right,
   deck > shadow.right,
   leaflet > shadow.right {
     background-image: linear-gradient(to left, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.02) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to left, rgba(0, 0, 0, 0.06), rgba(0, 0, 0, 0.02) 7px, rgba(0, 0, 0, 0) 24px); }
-  flap > shadow.up,
   deck > shadow.up,
   leaflet > shadow.up {
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.02) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to bottom, rgba(0, 0, 0, 0.06), rgba(0, 0, 0, 0.02) 7px, rgba(0, 0, 0, 0) 24px); }
-  flap > shadow.down,
   deck > shadow.down,
   leaflet > shadow.down {
     background-image: linear-gradient(to top, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.02) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to top, rgba(0, 0, 0, 0.06), rgba(0, 0, 0, 0.02) 7px, rgba(0, 0, 0, 0) 24px); }
 
-flap > outline,
 deck > outline,
 leaflet > outline {
   min-width: 1px;
@@ -4835,16 +4827,6 @@ viewswitchertitle viewswitcher {
   margin-left: 12px;
   margin-right: 12px; }
 
-statuspage > scrolledwindow > viewport > box {
-  margin: 36px 12px; }
-  statuspage > scrolledwindow > viewport > box > clamp > box > .icon {
-    margin-bottom: 36px;
-    opacity: 0.5; }
-  statuspage > scrolledwindow > viewport > box > clamp > box > .title {
-    margin-bottom: 12px; }
-  statuspage > scrolledwindow > viewport > box > clamp > box > .description {
-    margin-bottom: 36px; }
-
 /***************************
  * Check and Radio buttons *
  ***************************/

share/themes/Kali-Light/gtk-3.0/gtk-dark.css

@@ -4739,41 +4739,33 @@ row.expander {
   row.expander image.expander-row-arrow:disabled {
     color: #888a8d; }
 
-flap > dimming,
 deck > dimming,
 leaflet > dimming {
   background: rgba(0, 0, 0, 0.24); }
 
-flap > border,
 deck > border,
 leaflet > border {
   min-width: 1px;
   min-height: 1px;
   background: #0d0e11; }
 
-flap > shadow,
 deck > shadow,
 leaflet > shadow {
   min-width: 56px;
   min-height: 56px; }
-  flap > shadow.left,
   deck > shadow.left,
   leaflet > shadow.left {
     background-image: linear-gradient(to right, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.02) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to right, rgba(0, 0, 0, 0.06), rgba(0, 0, 0, 0.02) 7px, rgba(0, 0, 0, 0) 24px); }
-  flap > shadow.right,
   deck > shadow.right,
   leaflet > shadow.right {
     background-image: linear-gradient(to left, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.02) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to left, rgba(0, 0, 0, 0.06), rgba(0, 0, 0, 0.02) 7px, rgba(0, 0, 0, 0) 24px); }
-  flap > shadow.up,
   deck > shadow.up,
   leaflet > shadow.up {
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.02) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to bottom, rgba(0, 0, 0, 0.06), rgba(0, 0, 0, 0.02) 7px, rgba(0, 0, 0, 0) 24px); }
-  flap > shadow.down,
   deck > shadow.down,
   leaflet > shadow.down {
     background-image: linear-gradient(to top, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.02) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to top, rgba(0, 0, 0, 0.06), rgba(0, 0, 0, 0.02) 7px, rgba(0, 0, 0, 0) 24px); }
 
-flap > outline,
 deck > outline,
 leaflet > outline {
   min-width: 1px;
@@ -4835,16 +4827,6 @@ viewswitchertitle viewswitcher {
   margin-left: 12px;
   margin-right: 12px; }
 
-statuspage > scrolledwindow > viewport > box {
-  margin: 36px 12px; }
-  statuspage > scrolledwindow > viewport > box > clamp > box > .icon {
-    margin-bottom: 36px;
-    opacity: 0.5; }
-  statuspage > scrolledwindow > viewport > box > clamp > box > .title {
-    margin-bottom: 12px; }
-  statuspage > scrolledwindow > viewport > box > clamp > box > .description {
-    margin-bottom: 36px; }
-
 /***************************
  * Check and Radio buttons *
  ***************************/

share/themes/Kali-Light/gtk-3.0/gtk.css

@@ -4761,41 +4761,33 @@ row.expander {
   row.expander image.expander-row-arrow:disabled {
     color: #aeb0b6; }
 
-flap > dimming,
 deck > dimming,
 leaflet > dimming {
   background: rgba(0, 0, 0, 0.12); }
 
-flap > border,
 deck > border,
 leaflet > border {
   min-width: 1px;
   min-height: 1px;
   background: #d9d9d9; }
 
-flap > shadow,
 deck > shadow,
 leaflet > shadow {
   min-width: 56px;
   min-height: 56px; }
-  flap > shadow.left,
   deck > shadow.left,
   leaflet > shadow.left {
     background-image: linear-gradient(to right, rgba(0, 0, 0, 0.05), rgba(0, 0, 0, 0.01) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to right, rgba(0, 0, 0, 0.03), rgba(0, 0, 0, 0.01) 7px, rgba(0, 0, 0, 0) 24px); }
-  flap > shadow.right,
   deck > shadow.right,
   leaflet > shadow.right {
     background-image: linear-gradient(to left, rgba(0, 0, 0, 0.05), rgba(0, 0, 0, 0.01) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to left, rgba(0, 0, 0, 0.03), rgba(0, 0, 0, 0.01) 7px, rgba(0, 0, 0, 0) 24px); }
-  flap > shadow.up,
   deck > shadow.up,
   leaflet > shadow.up {
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.05), rgba(0, 0, 0, 0.01) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to bottom, rgba(0, 0, 0, 0.03), rgba(0, 0, 0, 0.01) 7px, rgba(0, 0, 0, 0) 24px); }
-  flap > shadow.down,
   deck > shadow.down,
   leaflet > shadow.down {
     background-image: linear-gradient(to top, rgba(0, 0, 0, 0.05), rgba(0, 0, 0, 0.01) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to top, rgba(0, 0, 0, 0.03), rgba(0, 0, 0, 0.01) 7px, rgba(0, 0, 0, 0) 24px); }
 
-flap > outline,
 deck > outline,
 leaflet > outline {
   min-width: 1px;
@@ -4857,16 +4849,6 @@ viewswitchertitle viewswitcher {
   margin-left: 12px;
   margin-right: 12px; }
 
-statuspage > scrolledwindow > viewport > box {
-  margin: 36px 12px; }
-  statuspage > scrolledwindow > viewport > box > clamp > box > .icon {
-    margin-bottom: 36px;
-    opacity: 0.5; }
-  statuspage > scrolledwindow > viewport > box > clamp > box > .title {
-    margin-bottom: 12px; }
-  statuspage > scrolledwindow > viewport > box > clamp > box > .description {
-    margin-bottom: 36px; }
-
 /***************************
  * Check and Radio buttons *
  ***************************/

src/themes/Kali/sass/Makefile

@@ -7,8 +7,8 @@ THEMES_DIR=../../../../share/themes/
 build: $(patsubst %.scss, %.css, $(wildcard *.scss))
 	mkdir -p $(THEMES_DIR)Kali-Light/gtk-3.0/
 	mkdir -p $(THEMES_DIR)Kali-Dark/gtk-3.0/
-	mkdir -p $(THEMES_DIR)Kali-Light/gnome-shell
+	mkdir -p $(THEMES_DIR)Kali-Light/gnome-shell/
-	mkdir -p $(THEMES_DIR)Kali-Dark/gnome-shell
+	mkdir -p $(THEMES_DIR)Kali-Dark/gnome-shell/
 	
 	cp gtk.css $(THEMES_DIR)Kali-Light/gtk-3.0/gtk.css
 	cp gtk-dark.css $(THEMES_DIR)Kali-Light/gtk-3.0/gtk-dark.css

src/themes/Kali/sass/gtk-dark.scss

@@ -8,9 +8,9 @@ $variant: 'dark';
 $high-contrast:'false';
 
 @import 'gtk-sass/_colors';
-@import 'gtk-sass/upstream/_drawing';
+@import 'gtk-sass/upstream-gtk-3/_drawing';
-@import 'gtk-sass/upstream/_common';
+@import 'gtk-sass/upstream-gtk-3/_common';
-@import 'gtk-sass/libhandy/Adwaita-base';
+@import 'gtk-sass/upstream-gtk-3/libhandy/Adwaita-base';
 @import 'gtk-sass/_common-tweaks';
 @import 'gtk-sass/_applications';
-@import 'gtk-sass/upstream/_colors-public';
+@import 'gtk-sass/upstream-gtk-3/_colors-public';

src/themes/Kali/sass/gtk-sass/libhandy/_drawing.scss

@@ -1 +0,0 @@
-../upstream/_drawing.scss

src/themes/Kali/sass/gtk-sass/upstream-gtk-3/_drawing.scss.patch

@@ -11,20 +11,19 @@
 <                                               linear-gradient(to top, darken($c,1%) 2px, $c)),
 ---
 >     background-image: linear-gradient(to top, if($c != $bg_color, $c, lighten($c, 3%)) 2px, lighten($c, 5%)),
-201c201
+202c201
 <     @include _button_text_shadow($tc, $c);
 ---
 >     //@include _button_text_shadow($tc, $c);
-216c216
+217c216
 <       @include _button_text_shadow($tc, lighten($c, 6%));
 ---
 >       //@include _button_text_shadow($tc, lighten($c, 6%));
-222c222
+223c222
 <       @include _button_text_shadow($tc,lighten($c, 6%));
 ---
 >       //@include _button_text_shadow($tc,lighten($c, 6%));
-234c234
+235c234
 <     @include _button_text_shadow($tc, $c);
 ---
 >     //@include _button_text_shadow($tc, $c);
-

src/themes/Kali/sass/gtk-sass/upstream-gtk-3/libhandy/_drawing.scss

@@ -0,0 +1 @@
+../_drawing.scss

src/themes/Kali/sass/gtk-sass/upstream-gtk-3/libhandy/_fallback-base.scss

@@ -69,7 +69,6 @@ row.expander {
 
 // Shadows
 
-flap,
 deck,
 leaflet {
   > dimming {
@@ -147,26 +146,3 @@ viewswitchertitle viewswitcher {
   margin-left: 12px;
   margin-right: 12px;
 }
-
-// HdyStatusPage
-
-statuspage > scrolledwindow > viewport > box {
-  margin: 36px 12px;
-
-  > clamp > box {
-    > .icon {
-      margin-bottom: 36px;
-      opacity: 0.5;
-    }
-
-    > .title {
-      margin-bottom: 12px;
-    }
-
-    > .description {
-      margin-bottom: 36px;
-    }
-  }
-}
-
-

src/themes/Kali/sass/gtk-sass/upstream-gtk-3/libhandy/sync.sh

@@ -4,11 +4,17 @@ GREEN='\033[0;32m'
 YELLOW='\033[0;33m'
 RESET='\033[0m'
 
+VERSION=1.0.3
+
+echo
+printf " $YELLOW[ i ]$RESET Upstream version $VERSION\n"
+echo
+
 while read file;
 do
 	echo
 	printf " $GREEN[ * ]$RESET Downloading file $file\n"
-	wget https://gitlab.gnome.org/GNOME/libhandy/-/raw/master/src/themes/$file --timestamping --quiet
+	wget https://gitlab.gnome.org/GNOME/libhandy/raw/$VERSION/src/themes/$file --timestamping --quiet
 done <<- EOF
 	_definitions.scss
 	_shared-base.scss
@@ -17,4 +23,4 @@ done <<- EOF
 EOF
 echo
 
-ln -rsfv ../upstream/_drawing.scss
+ln -rsfv ../_drawing.scss

src/themes/Kali/sass/gtk.scss

@@ -8,9 +8,9 @@ $variant: 'light';
 $high-contrast:'false';
 
 @import 'gtk-sass/_colors';
-@import 'gtk-sass/upstream/_drawing';
+@import 'gtk-sass/upstream-gtk-3/_drawing';
-@import 'gtk-sass/upstream/_common';
+@import 'gtk-sass/upstream-gtk-3/_common';
-@import 'gtk-sass/libhandy/Adwaita-base';
+@import 'gtk-sass/upstream-gtk-3/libhandy/Adwaita-base';
 @import 'gtk-sass/_common-tweaks';
 @import 'gtk-sass/_applications';
-@import 'gtk-sass/upstream/_colors-public';
+@import 'gtk-sass/upstream-gtk-3/_colors-public';