From 896f5c7d411c961c223f08f25b08241536444c5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= <daniruiz@kali.org>
Date: Mon, 3 Apr 2023 16:43:01 +0200
Subject: [PATCH] Gnome-Shell: minor theme fixes

---
 .../Kali-Dark/gnome-shell/gnome-shell.css     | 28 +++++++++++--------
 .../Kali-Light/gnome-shell/gnome-shell.css    | 28 +++++++++++--------
 .../gnome-shell/gnome-shell.css               | 28 +++++++++++--------
 .../gnome-shell/gnome-shell.css               | 28 +++++++++++--------
 .../Kali/sass/gnome-shell/_common-tweaks.scss | 10 ++++++-
 5 files changed, 77 insertions(+), 45 deletions(-)

diff --git a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
index 2b7f9b5f..a2fe8abe 100644
--- a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
+++ b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
@@ -2827,26 +2827,27 @@ StScrollBar {
 .datemenu-today-button:insensitive {
   color: inherit; }
 
+/* Quick Settings */
+.quick-toggle-menu .header .icon.active {
+  color: #ffffff; }
+
 /* Search */
 .search-entry {
-  color: black;
-  text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.5);
-  font-weight: bold;
+  width: 21em;
+  padding: .6em .8em;
   font-size: 1.1em;
+  font-weight: bold;
+  border: none;
+  text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.5);
   transition-duration: 200ms; }
-  .search-entry StLabel.hint-text {
+  .search-entry, .search-entry StLabel.hint-text {
     color: white; }
-  .search-entry, .search-entry:focus, .search-entry:hover {
-    width: 21em;
-    padding: .6em .8em;
-    border: none; }
   .search-entry:focus, .search-entry:hover {
     background-color: white;
-    color: black;
     font-weight: normal;
     box-shadow: none;
     text-shadow: none; }
-    .search-entry:focus StLabel.hint-text, .search-entry:hover StLabel.hint-text {
+    .search-entry:focus, .search-entry:focus StLabel.hint-text, .search-entry:hover, .search-entry:hover StLabel.hint-text {
       color: black; }
     .search-entry:focus .search-entry-icon, .search-entry:hover .search-entry-icon {
       color: black;
@@ -2868,7 +2869,7 @@ StScrollBar {
     icon-shadow: 0 2px 6px rgba(0, 0, 0, 0.4); }
 
 /* App Grid */
-#overview {
+#overview, .app-well-app, .grid-search-result {
   color: white; }
 
 .app-well-app.app-folder, .app-folder.grid-search-result {
@@ -2897,10 +2898,15 @@ StScrollBar {
 
 .app-folder-dialog {
   background: black;
+  color: white;
   box-shadow: 0 0 100px #0a0a0a; }
   .app-folder-dialog .folder-name-container .folder-name-entry {
     color: white; }
 
+/* OSD */
+.osd-window, .workspace-switcher {
+  margin-bottom: 128px; }
+
 /* Workspace pager */
 .workspace-thumbnail-indicator {
   border: 2px solid white; }
diff --git a/share/themes/Kali-Light/gnome-shell/gnome-shell.css b/share/themes/Kali-Light/gnome-shell/gnome-shell.css
index 4b620ef4..5299f5eb 100644
--- a/share/themes/Kali-Light/gnome-shell/gnome-shell.css
+++ b/share/themes/Kali-Light/gnome-shell/gnome-shell.css
@@ -2827,26 +2827,27 @@ StScrollBar {
 .datemenu-today-button:insensitive {
   color: inherit; }
 
+/* Quick Settings */
+.quick-toggle-menu .header .icon.active {
+  color: #ffffff; }
+
 /* Search */
 .search-entry {
-  color: black;
-  text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.5);
-  font-weight: bold;
+  width: 21em;
+  padding: .6em .8em;
   font-size: 1.1em;
+  font-weight: bold;
+  border: none;
+  text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.5);
   transition-duration: 200ms; }
-  .search-entry StLabel.hint-text {
+  .search-entry, .search-entry StLabel.hint-text {
     color: white; }
-  .search-entry, .search-entry:focus, .search-entry:hover {
-    width: 21em;
-    padding: .6em .8em;
-    border: none; }
   .search-entry:focus, .search-entry:hover {
     background-color: white;
-    color: black;
     font-weight: normal;
     box-shadow: none;
     text-shadow: none; }
-    .search-entry:focus StLabel.hint-text, .search-entry:hover StLabel.hint-text {
+    .search-entry:focus, .search-entry:focus StLabel.hint-text, .search-entry:hover, .search-entry:hover StLabel.hint-text {
       color: black; }
     .search-entry:focus .search-entry-icon, .search-entry:hover .search-entry-icon {
       color: black;
@@ -2868,7 +2869,7 @@ StScrollBar {
     icon-shadow: 0 2px 6px rgba(0, 0, 0, 0.4); }
 
 /* App Grid */
-#overview {
+#overview, .app-well-app, .grid-search-result {
   color: white; }
 
 .app-well-app.app-folder, .app-folder.grid-search-result {
@@ -2897,10 +2898,15 @@ StScrollBar {
 
 .app-folder-dialog {
   background: black;
+  color: white;
   box-shadow: 0 0 100px #0a0a0a; }
   .app-folder-dialog .folder-name-container .folder-name-entry {
     color: white; }
 
+/* OSD */
+.osd-window, .workspace-switcher {
+  margin-bottom: 128px; }
+
 /* Workspace pager */
 .workspace-thumbnail-indicator {
   border: 2px solid white; }
diff --git a/share/themes/Kali-Purple-Dark/gnome-shell/gnome-shell.css b/share/themes/Kali-Purple-Dark/gnome-shell/gnome-shell.css
index 829091c2..78b801e1 100644
--- a/share/themes/Kali-Purple-Dark/gnome-shell/gnome-shell.css
+++ b/share/themes/Kali-Purple-Dark/gnome-shell/gnome-shell.css
@@ -2827,26 +2827,27 @@ StScrollBar {
 .datemenu-today-button:insensitive {
   color: inherit; }
 
+/* Quick Settings */
+.quick-toggle-menu .header .icon.active {
+  color: #ffffff; }
+
 /* Search */
 .search-entry {
-  color: black;
-  text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.5);
-  font-weight: bold;
+  width: 21em;
+  padding: .6em .8em;
   font-size: 1.1em;
+  font-weight: bold;
+  border: none;
+  text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.5);
   transition-duration: 200ms; }
-  .search-entry StLabel.hint-text {
+  .search-entry, .search-entry StLabel.hint-text {
     color: white; }
-  .search-entry, .search-entry:focus, .search-entry:hover {
-    width: 21em;
-    padding: .6em .8em;
-    border: none; }
   .search-entry:focus, .search-entry:hover {
     background-color: white;
-    color: black;
     font-weight: normal;
     box-shadow: none;
     text-shadow: none; }
-    .search-entry:focus StLabel.hint-text, .search-entry:hover StLabel.hint-text {
+    .search-entry:focus, .search-entry:focus StLabel.hint-text, .search-entry:hover, .search-entry:hover StLabel.hint-text {
       color: black; }
     .search-entry:focus .search-entry-icon, .search-entry:hover .search-entry-icon {
       color: black;
@@ -2868,7 +2869,7 @@ StScrollBar {
     icon-shadow: 0 2px 6px rgba(0, 0, 0, 0.4); }
 
 /* App Grid */
-#overview {
+#overview, .app-well-app, .grid-search-result {
   color: white; }
 
 .app-well-app.app-folder, .app-folder.grid-search-result {
@@ -2897,10 +2898,15 @@ StScrollBar {
 
 .app-folder-dialog {
   background: black;
+  color: white;
   box-shadow: 0 0 100px #0a0a0a; }
   .app-folder-dialog .folder-name-container .folder-name-entry {
     color: white; }
 
+/* OSD */
+.osd-window, .workspace-switcher {
+  margin-bottom: 128px; }
+
 /* Workspace pager */
 .workspace-thumbnail-indicator {
   border: 2px solid white; }
diff --git a/share/themes/Kali-Purple-Light/gnome-shell/gnome-shell.css b/share/themes/Kali-Purple-Light/gnome-shell/gnome-shell.css
index d8d63e0f..612a8112 100644
--- a/share/themes/Kali-Purple-Light/gnome-shell/gnome-shell.css
+++ b/share/themes/Kali-Purple-Light/gnome-shell/gnome-shell.css
@@ -2827,26 +2827,27 @@ StScrollBar {
 .datemenu-today-button:insensitive {
   color: inherit; }
 
+/* Quick Settings */
+.quick-toggle-menu .header .icon.active {
+  color: #ffffff; }
+
 /* Search */
 .search-entry {
-  color: black;
-  text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.5);
-  font-weight: bold;
+  width: 21em;
+  padding: .6em .8em;
   font-size: 1.1em;
+  font-weight: bold;
+  border: none;
+  text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.5);
   transition-duration: 200ms; }
-  .search-entry StLabel.hint-text {
+  .search-entry, .search-entry StLabel.hint-text {
     color: white; }
-  .search-entry, .search-entry:focus, .search-entry:hover {
-    width: 21em;
-    padding: .6em .8em;
-    border: none; }
   .search-entry:focus, .search-entry:hover {
     background-color: white;
-    color: black;
     font-weight: normal;
     box-shadow: none;
     text-shadow: none; }
-    .search-entry:focus StLabel.hint-text, .search-entry:hover StLabel.hint-text {
+    .search-entry:focus, .search-entry:focus StLabel.hint-text, .search-entry:hover, .search-entry:hover StLabel.hint-text {
       color: black; }
     .search-entry:focus .search-entry-icon, .search-entry:hover .search-entry-icon {
       color: black;
@@ -2868,7 +2869,7 @@ StScrollBar {
     icon-shadow: 0 2px 6px rgba(0, 0, 0, 0.4); }
 
 /* App Grid */
-#overview {
+#overview, .app-well-app, .grid-search-result {
   color: white; }
 
 .app-well-app.app-folder, .app-folder.grid-search-result {
@@ -2897,10 +2898,15 @@ StScrollBar {
 
 .app-folder-dialog {
   background: black;
+  color: white;
   box-shadow: 0 0 100px #0a0a0a; }
   .app-folder-dialog .folder-name-container .folder-name-entry {
     color: white; }
 
+/* OSD */
+.osd-window, .workspace-switcher {
+  margin-bottom: 128px; }
+
 /* Workspace pager */
 .workspace-thumbnail-indicator {
   border: 2px solid white; }
diff --git a/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss b/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss
index 3c549def..0b5036e8 100644
--- a/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss
+++ b/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss
@@ -206,7 +206,7 @@ $dialog_box_shadow: 0 2px 6px -2px transparentize(black, .8);
 }
 
 /* App Grid */
-#overview { color: $osd_fg_color; }
+#overview, .app-well-app { color: $osd_fg_color; }
 
 // Icon tiles in the app grid
 .app-well-app.app-folder {
@@ -218,11 +218,19 @@ $dialog_box_shadow: 0 2px 6px -2px transparentize(black, .8);
 
 .app-folder-dialog {
   background: black;
+  color: $osd_fg_color;
   box-shadow: 0 0 100px lighten(black, 4%);
 
   & .folder-name-container .folder-name-entry { color: white; }
 }
 
+/* OSD */
+
+// Raise volume and workspace-switcher osd dialogs
+.osd-window, .workspace-switcher {
+  margin-bottom: 128px;
+}
+
 /* Workspace pager */
 // thumbnails in overview
 .workspace-thumbnails {