From c32d92482ff8af2d057eb54698fba50882ed458f Mon Sep 17 00:00:00 2001
From: "Sly Kint A. Bacalso" <64179667+Son0fAnton@users.noreply.github.com>
Date: Thu, 21 Oct 2021 01:32:01 +0800
Subject: [PATCH] update dash to dock for gnome40

---
 src/other/dash-to-dock/_dash-to-dock-4.scss           |  8 +++++---
 src/sass/_variables.scss                              |  2 +-
 src/sass/gnome-shell/common/_app-grid.scss            |  2 +-
 .../gnome-shell/extensions-40-0/_dash-to-dock.scss    |  7 +++++--
 src/sass/gnome-shell/widgets-40-0/_dash.scss          | 11 +++++++----
 src/sass/gtk/apps/_elementary.scss                    |  1 +
 6 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/other/dash-to-dock/_dash-to-dock-4.scss b/src/other/dash-to-dock/_dash-to-dock-4.scss
index 471fb5e..de74fbd 100644
--- a/src/other/dash-to-dock/_dash-to-dock-4.scss
+++ b/src/other/dash-to-dock/_dash-to-dock-4.scss
@@ -2,7 +2,7 @@
 $dash_background_color: if($variant == 'light', rgba($panel_bg, $panel_opacity), rgba($panel_bg, $panel_opacity + 0.1));
 $dash_placeholder_size: 32px;
 $dash_padding: $base_padding + 4px; // 10px
-$dash_spacing: round($base_padding / 4);
+$dash_spacing: round($base_padding / 6);
 $dash_bottom_margin: $base_margin * 4;
 $dash_border_radius: $dash_radius;
 
@@ -240,11 +240,13 @@ $osd_fg_color: #eeeeec;
 
 #dashtodockContainer.running-dots .app-well-app.focused .overview-icon,
 #dashtodockContainer.dashtodock .app-well-app.focused .overview-icon {
-    background-color: rgba(238, 238, 236, 0.2);
+    // background-color: rgba(238, 238, 236, 0.2);
+    background-color: transparent;
 }
 
 #dashtodockContainer.dashtodock #dash .dash-background {
-    background: #2e3436;
+    // background: #2e3436;
+    background: #525252;
 }
 
 #dashtodockContainer.dashtodock .progress-bar {
diff --git a/src/sass/_variables.scss b/src/sass/_variables.scss
index 3ea83dd..66ccb0e 100644
--- a/src/sass/_variables.scss
+++ b/src/sass/_variables.scss
@@ -44,7 +44,7 @@ $bt_radius: if($laptop == 'false', 6px, 6px);
 $bd_radius: if($laptop == 'false', 6px, 6px); // 8 radius
 $wm_radius: if($laptop == 'false', 8px, 8px); // 12 radius
 $mn_radius: if($laptop == 'false', 5px, 5px); // 10 radius
-$dash_radius: if($laptop == 'false', 24px, 18px);
+$dash_radius: if($laptop == 'false', 8px, 8px);
 $base_border_radius: if($laptop == 'false', 6px, 6px); // 8 radius
 $modal_radius: $base_border_radius * 2;
 $maximized_radius: 8px;
diff --git a/src/sass/gnome-shell/common/_app-grid.scss b/src/sass/gnome-shell/common/_app-grid.scss
index a24aa47..2ccf912 100644
--- a/src/sass/gnome-shell/common/_app-grid.scss
+++ b/src/sass/gnome-shell/common/_app-grid.scss
@@ -120,7 +120,7 @@
 
 // Running app indicator (also shown in dash)
 .app-well-app-running-dot {
-  width: 5px; height: 5px;
+  width: 3px; height: 3px; // 5px  5px
   border-radius: 3px;
   background-color: $light_alt_fg_color;
   margin-bottom: 0;
diff --git a/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss b/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss
index 7c4f26c..14cf4d7 100644
--- a/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss
+++ b/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss
@@ -84,11 +84,13 @@
       &:focus .overview-icon,
       &:selected .overview-icon {
         background-color: if($variant == 'light', rgba(white, 0.25), $light_divider_color);
+        // background-color: transparent;
       }
 
       &:active .overview-icon,
       &:checked .overview-icon {
-        background-color: if($variant == 'light', rgba(white, 0.35), $light_track_color);
+        // background-color: if($variant == 'light', rgba(white, 0.35), $light_track_color);
+        background-color: transparent;
       }
     }
   }
@@ -128,7 +130,8 @@
 
       &:active .overview-icon,
       &:checked .overview-icon {
-        background-color: $light_track_color;
+        // background-color: $light_track_color;
+        background-color: transparent;
       }
     }
   }
diff --git a/src/sass/gnome-shell/widgets-40-0/_dash.scss b/src/sass/gnome-shell/widgets-40-0/_dash.scss
index 290b85d..328240f 100644
--- a/src/sass/gnome-shell/widgets-40-0/_dash.scss
+++ b/src/sass/gnome-shell/widgets-40-0/_dash.scss
@@ -1,9 +1,10 @@
 $dash_background_color: if($variant == 'light', rgba($panel_bg, $panel_opacity), rgba($panel_bg, $panel_opacity + 0.1));
 $dash_placeholder_size: 32px;
 $dash_padding: $base_padding + 4px; // 10px/8px
-$dash_spacing: $base_padding / 4;
+$dash_spacing: $base_padding / 6; //  /4
 $dash_bottom_margin: $base_margin * 4;
-$dash_border_radius: $dash_padding * 1.5 + 12px;
+// $dash_border_radius: $dash_padding * 1.5 + 12px;
+$dash_border_radius: $dash_padding;
 
 #dash {
   margin-top: $base_spacing * 2;
@@ -16,8 +17,10 @@ $dash_border_radius: $dash_padding * 1.5 + 12px;
   }
 
   .overview-icon {
-    padding: $dash_padding / 2;
-    border-radius: $dash_padding / 2 + 12px;
+    // padding: $dash_padding / 2;
+    padding: $dash_padding/4;
+    // border-radius: $dash_padding / 2 + 12px;
+    border-radius: $dash_padding;
   }
 
   // Running app indicator (shown in dash)
diff --git a/src/sass/gtk/apps/_elementary.scss b/src/sass/gtk/apps/_elementary.scss
index d1735ca..0b9d553 100644
--- a/src/sass/gtk/apps/_elementary.scss
+++ b/src/sass/gtk/apps/_elementary.scss
@@ -572,6 +572,7 @@ scale.warmth trough {
 .terminal-window {
   headerbar.titlebar.default-decoration {
     background-color: $header_bg;
+    height: 28px;
     border-bottom: 1px solid $header_border;
     box-shadow: inset 0 1px $highlight_color;