From a5e8268d0831868c44d2b566220bf7e4b0c399be Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Mon, 10 Jun 2024 01:04:43 +0800
Subject: [PATCH] Fixed issues

---
 .../extensions-46-0/_dash-to-dock.scss        | 39 ++++++++++++++++---
 src/sass/gnome-shell/widgets-46-0/_dash.scss  |  6 ++-
 .../widgets-46-0/_quick-settings.scss         |  2 +-
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/src/sass/gnome-shell/extensions-46-0/_dash-to-dock.scss b/src/sass/gnome-shell/extensions-46-0/_dash-to-dock.scss
index 590b596e..fa7b7c8e 100644
--- a/src/sass/gnome-shell/extensions-46-0/_dash-to-dock.scss
+++ b/src/sass/gnome-shell/extensions-46-0/_dash-to-dock.scss
@@ -18,7 +18,7 @@
     color: white;
     background-color: rgba(black, 0.75);
     text-align: center;
-    padding: 0.4em 0.5em;
+    padding: 0.2em 0.4em;
   }
 
   .notification-badge {
@@ -29,7 +29,7 @@
     box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.25);
     border-radius: $circular-radius;
     margin: 2px 3px 5px;
-    padding: 3px;
+    padding: 0.2em 0.4em;
     font-weight: bold;
     text-align: center;
   }
@@ -276,9 +276,22 @@
       background-color: $panel;
     }
 
+    .overview-tile,
+    .show-apps {
+      .overview-icon {
+        color: $panel-text;
+      }
+
+      &:focus .overview-icon { background-color: $panel-fill; }
+      &:hover .overview-icon { background-color: $panel-divider; }
+      &:active .overview-icon { background-color: $panel-track; }
+      &:checked .overview-icon { background-color: $panel-divider; }
+    }
+
     .app-grid-running-dot {
-      margin-bottom: 6px !important;
-      margin-top: 0 !important;
+      margin: 0 !important;
+      offset-y: 0 !important;
+      background-color: $panel-text-disabled;
     }
 
     StWidget.focused .app-grid-running-dot {
@@ -297,8 +310,24 @@
   &:overview #dash { // overview-mode #1
     background: none;
 
+    .overview-tile,
+    .show-apps {
+      .overview-icon {
+        color: on($osd);
+      }
+
+      &:focus .overview-icon { background-color: on($osd, fill); }
+      &:hover .overview-icon { background-color: on($osd, divider); }
+      &:active .overview-icon { background-color: on($osd, track); }
+      &:checked .overview-icon { background-color: on($osd, divider); }
+    }
+
     .dash-background {
-      background-color: on(dark, divider);
+      background-color: on($osd, divider);
+    }
+
+    .app-grid-running-dot {
+      background-color: on($osd, disabled);
     }
 
     StWidget.focused .app-grid-running-dot {
diff --git a/src/sass/gnome-shell/widgets-46-0/_dash.scss b/src/sass/gnome-shell/widgets-46-0/_dash.scss
index 52b650c1..77215b20 100644
--- a/src/sass/gnome-shell/widgets-46-0/_dash.scss
+++ b/src/sass/gnome-shell/widgets-46-0/_dash.scss
@@ -11,7 +11,9 @@ $dash_spacing: $base_margin * 0.5;
 
 // container for the dash
 #dash {
-  margin-top: $dash_edge_offset;
+  // a bit of spacing so that dash doesn't touch the screen edges
+  padding-left: $base_padding;
+  padding-right: $base_padding;
 
   // background behind item container
   .dash-background {
@@ -69,7 +71,7 @@ $dash_spacing: $base_margin * 0.5;
     // running app dot
     .app-grid-running-dot {
       // manually position the dot within the dash item
-      margin-bottom: $dash_padding + $dash_edge_offset - 6px; // 3px = size of dot (5px) subtracted from its translationY from appDisplay.js
+      offset-y: -$dash_padding;
     }
   }
 
diff --git a/src/sass/gnome-shell/widgets-46-0/_quick-settings.scss b/src/sass/gnome-shell/widgets-46-0/_quick-settings.scss
index 51b43a86..013e32d8 100644
--- a/src/sass/gnome-shell/widgets-46-0/_quick-settings.scss
+++ b/src/sass/gnome-shell/widgets-46-0/_quick-settings.scss
@@ -1,7 +1,7 @@
 .quick-settings {
   padding: $base_padding * 3 !important;
   border-radius: $base_radius + $base_padding * 3 !important;
-  margin-top: $base_padding + 4px !important;
+  margin-top: 4px !important;
 
   .icon-button, .button {
     padding: $base_padding * 1.75;