From 857390cc6fdbf6d4e63d388c999dc72dd9aa7047 Mon Sep 17 00:00:00 2001
From: Vince <vinceliuice@hotmail.com>
Date: Mon, 24 May 2021 12:49:48 +0800
Subject: [PATCH] update

---
 src/sass/_gtk-base.scss                    |  2 +-
 src/sass/gnome-shell/common/_app-grid.scss |  3 ++-
 src/sass/gnome-shell/common/_panel.scss    | 15 +++++++++++----
 src/sass/gtk/_applications-3.0.scss        |  5 ++---
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/sass/_gtk-base.scss b/src/sass/_gtk-base.scss
index 9f9bbd6f..94ab4223 100644
--- a/src/sass/_gtk-base.scss
+++ b/src/sass/_gtk-base.scss
@@ -1,5 +1,5 @@
 // Theme base options
 $laptop: 'false';
 $trans: 'true';
-$black: 'false'; // panel font option
+$black: 'false'; // panel font color
 $theme: 'default';
diff --git a/src/sass/gnome-shell/common/_app-grid.scss b/src/sass/gnome-shell/common/_app-grid.scss
index dd074ea6..710f1a6b 100644
--- a/src/sass/gnome-shell/common/_app-grid.scss
+++ b/src/sass/gnome-shell/common/_app-grid.scss
@@ -7,12 +7,13 @@
   @include font(body-1);
 
   & .overview-icon {
-    color: $light_alt_fg_color;
+    color: $light_fg_color;
     border-radius: $wm_radius;
     padding: 8px;
     border: none;
     transition-duration: 100ms;
     text-align: center;
+    text-shadow: none;
   }
 
   &:hover .overview-icon,
diff --git a/src/sass/gnome-shell/common/_panel.scss b/src/sass/gnome-shell/common/_panel.scss
index d35ffac0..89323531 100644
--- a/src/sass/gnome-shell/common/_panel.scss
+++ b/src/sass/gnome-shell/common/_panel.scss
@@ -98,7 +98,7 @@
     }
 
     &.clock-display {
-      StLabel { padding: 0 2px; }
+      StLabel { padding: 0 $base_margin; }
 
       .clock {
         // transition-duration: 150ms;
@@ -126,12 +126,12 @@
     // status area icons
     .system-status-icon {
       icon-size: $base_icon_size;
-      padding: $base_padding $base_padding/2;
-      margin: 0 ($base_margin - 2px);
+      padding: $base_padding;
+      margin: 0 $base_margin;
     }
 
     // .panel-status-indicators-box .system-status-icon,
-    .panel-status-menu-box .system-status-icon { margin: 0; }
+    .panel-status-menu-box .system-status-icon { margin: 0 0; }
     .panel-status-menu-box StLabel { padding: 0 0 0 2px; }
 
     // app menu icon
@@ -145,6 +145,13 @@
     }
   }
 
+  Gjs_AggregateMenu.panel-button,
+  Gjs_ui_panel_AggregateMenu.panel-button {
+    .system-status-icon {
+      margin: 0 $base_margin / 2;
+    }
+  }
+
   &.unlock-screen,
   &.login-screen,
   &:overview {
diff --git a/src/sass/gtk/_applications-3.0.scss b/src/sass/gtk/_applications-3.0.scss
index 28123113..a30327b0 100644
--- a/src/sass/gtk/_applications-3.0.scss
+++ b/src/sass/gtk/_applications-3.0.scss
@@ -730,8 +730,7 @@ $disk_space_free: darken($bg_color, 3%);
 
     button {
       @extend %headerbar_buttons;
-      padding-top: 0;
-      padding-bottom: 0;
+      padding: 0 $container_padding + 2px;
       margin: 6px 1px;
     }
 
@@ -3103,7 +3102,7 @@ window.thunar {
     }
 
     > separator {
-      background-image: if($variant == 'light', image($solid_borders_color), image($header_border));
+      background-image: image($solid_borders_color);
     }
   }