From 77e6a756d6f185b226549c3f9340cfcc288f8b92 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sun, 27 Feb 2022 22:29:53 +0800
Subject: [PATCH] update

---
 src/gnome-shell/sass/widgets/_panel.scss      | 63 +++++++------------
 .../shell-40-0/gnome-shell-compact.css        | 44 +++++++------
 .../shell-40-0/gnome-shell-dark-compact.css   | 44 +++++++------
 .../shell-40-0/gnome-shell-dark.css           | 44 +++++++------
 src/gnome-shell/shell-40-0/gnome-shell.css    | 44 +++++++------
 5 files changed, 106 insertions(+), 133 deletions(-)

diff --git a/src/gnome-shell/sass/widgets/_panel.scss b/src/gnome-shell/sass/widgets/_panel.scss
index 8a7e2b1..238cbc5 100644
--- a/src/gnome-shell/sass/widgets/_panel.scss
+++ b/src/gnome-shell/sass/widgets/_panel.scss
@@ -53,38 +53,38 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
     -natural-hpadding: $container_padding;
     -minimum-hpadding: $container_padding;
     transition-duration: 150ms;
-    border: none;
+    border: $container_padding / 2 solid transparent;
     border-radius: $circular_radius;
-    margin: $container_padding / 2 0;
+    margin: 0;
 
     &:hover {
-      background-color: $inverse_divider_color;
-      box-shadow: none;
+      background-color: transparent;
+      box-shadow: inset 0 0 0 1000px $inverse_divider_color;
 
       // The clock display needs to have the background on .clock because
       // we want to exclude the do-not-disturb indicator from the background
       &.clock-display {
         box-shadow: none;
+        background-color: transparent;
 
         .clock {
-          background-color: none;
-          box-shadow: none;
+          box-shadow: inset 0 0 0 1000px $inverse_divider_color;
         }
       }
     }
 
     &:active, &:overview, &:focus, &:checked {
-      background-color: $inverse_track_color;
-      box-shadow: none;
+      background-color: transparent;
+      box-shadow: inset 0 0 0 1000px $inverse_track_color;
 
       // The clock display needs to have the background on .clock because
       // we want to exclude the do-not-disturb indicator from the background
       &.clock-display {
         box-shadow: none;
+        background-color: transparent;
 
         .clock {
-          background-color: none;
-          box-shadow: none;
+          box-shadow: inset 0 0 0 1000px $inverse_track_color;
         }
       }
     }
@@ -143,21 +143,20 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
     }
   }
 
-  Gjs_ui_panel_AggregateMenu.panel-button,
+  // Gjs_ui_panel_AggregateMenu.panel-button,
   Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button {
+    border: none !important;
     margin: $container_padding / 2 !important;
-    // background-color: rgba(white, 0.1);
-
-   //  .arc-menu-icon {
-   //    background-color: rgba(white, 0.1);
-   //    padding: 0 0 !important;
-   //    margin: $container_padding / 2 !important;
-   //    border-radius: $circular_radius;
-   //    width: $medium-size - $container_padding / 2 !important;
-   //  }
-   //
-   // &:hover .arc-menu-icon { background-color: rgba(white, 0.18) !important; }
-   // &:active, &:overview, &:focus, &:checked { .arc-menu-icon { background-color: rgba(white, 0.28) !important; }}
+
+    &:hover {
+      background-color: $inverse_divider_color;
+      box-shadow: none;
+    }
+
+    &:active, &:overview, &:focus, &:checked {
+      background-color: $inverse_track_color;
+      box-shadow: none;
+    }
   }
 
   Gjs_ui_panel_AggregateMenu.panel-button {
@@ -174,24 +173,6 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
     }
   }
 
-  &.unlock-screen,
-  &.login-screen,
-  &:overview {
-    .panel-button {
-      &:hover, &:active, &:overview, &:focus, &:checked {
-        box-shadow: none;
-
-        &.clock-display {
-          box-shadow: none;
-
-          .clock {
-            box-shadow: none;
-          }
-        }
-      }
-    }
-  }
-
   .panel-status-indicators-box,
   .panel-status-menu-box {
     spacing: 2px;
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-compact.css
index 98b7a45..94ca28b 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-compact.css
@@ -1824,37 +1824,37 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -natural-hpadding: 4px;
   -minimum-hpadding: 4px;
   transition-duration: 150ms;
-  border: none;
+  border: 2px solid transparent;
   border-radius: 9999px;
-  margin: 2px 0;
+  margin: 0;
 }
 
 #panel .panel-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
-  box-shadow: none;
+  background-color: transparent;
+  box-shadow: inset 0 0 0 1000px rgba(255, 255, 255, 0.15);
 }
 
 #panel .panel-button:hover.clock-display {
   box-shadow: none;
+  background-color: transparent;
 }
 
 #panel .panel-button:hover.clock-display .clock {
-  background-color: none;
-  box-shadow: none;
+  box-shadow: inset 0 0 0 1000px rgba(255, 255, 255, 0.15);
 }
 
 #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
-  background-color: rgba(255, 255, 255, 0.3);
-  box-shadow: none;
+  background-color: transparent;
+  box-shadow: inset 0 0 0 1000px rgba(255, 255, 255, 0.3);
 }
 
 #panel .panel-button:active.clock-display, #panel .panel-button:overview.clock-display, #panel .panel-button:focus.clock-display, #panel .panel-button:checked.clock-display {
   box-shadow: none;
+  background-color: transparent;
 }
 
 #panel .panel-button:active.clock-display .clock, #panel .panel-button:overview.clock-display .clock, #panel .panel-button:focus.clock-display .clock, #panel .panel-button:checked.clock-display .clock {
-  background-color: none;
-  box-shadow: none;
+  box-shadow: inset 0 0 0 1000px rgba(255, 255, 255, 0.3);
 }
 
 #panel .panel-button .system-status-icon {
@@ -1902,11 +1902,21 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   box-shadow: none;
 }
 
-#panel Gjs_ui_panel_AggregateMenu.panel-button,
 #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button {
+  border: none !important;
   margin: 2px !important;
 }
 
+#panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button:hover {
+  background-color: rgba(255, 255, 255, 0.15);
+  box-shadow: none;
+}
+
+#panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button:active, #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button:overview, #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button:focus, #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button:checked {
+  background-color: rgba(255, 255, 255, 0.3);
+  box-shadow: none;
+}
+
 #panel Gjs_ui_panel_AggregateMenu.panel-button .system-status-icon {
   margin: 0 0 !important;
   padding: 4px !important;
@@ -1917,18 +1927,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 0 !important;
 }
 
-#panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
-  box-shadow: none;
-}
-
-#panel.unlock-screen .panel-button:hover.clock-display, #panel.unlock-screen .panel-button:active.clock-display, #panel.unlock-screen .panel-button:overview.clock-display, #panel.unlock-screen .panel-button:focus.clock-display, #panel.unlock-screen .panel-button:checked.clock-display, #panel.login-screen .panel-button:hover.clock-display, #panel.login-screen .panel-button:active.clock-display, #panel.login-screen .panel-button:overview.clock-display, #panel.login-screen .panel-button:focus.clock-display, #panel.login-screen .panel-button:checked.clock-display, #panel:overview .panel-button:hover.clock-display, #panel:overview .panel-button:active.clock-display, #panel:overview .panel-button:overview.clock-display, #panel:overview .panel-button:focus.clock-display, #panel:overview .panel-button:checked.clock-display {
-  box-shadow: none;
-}
-
-#panel.unlock-screen .panel-button:hover.clock-display .clock, #panel.unlock-screen .panel-button:active.clock-display .clock, #panel.unlock-screen .panel-button:overview.clock-display .clock, #panel.unlock-screen .panel-button:focus.clock-display .clock, #panel.unlock-screen .panel-button:checked.clock-display .clock, #panel.login-screen .panel-button:hover.clock-display .clock, #panel.login-screen .panel-button:active.clock-display .clock, #panel.login-screen .panel-button:overview.clock-display .clock, #panel.login-screen .panel-button:focus.clock-display .clock, #panel.login-screen .panel-button:checked.clock-display .clock, #panel:overview .panel-button:hover.clock-display .clock, #panel:overview .panel-button:active.clock-display .clock, #panel:overview .panel-button:overview.clock-display .clock, #panel:overview .panel-button:focus.clock-display .clock, #panel:overview .panel-button:checked.clock-display .clock {
-  box-shadow: none;
-}
-
 #panel .panel-status-indicators-box,
 #panel .panel-status-menu-box {
   spacing: 2px;
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-dark-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-dark-compact.css
index 1f0fa6b..5700dc4 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-dark-compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-dark-compact.css
@@ -1824,37 +1824,37 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -natural-hpadding: 4px;
   -minimum-hpadding: 4px;
   transition-duration: 150ms;
-  border: none;
+  border: 2px solid transparent;
   border-radius: 9999px;
-  margin: 2px 0;
+  margin: 0;
 }
 
 #panel .panel-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
-  box-shadow: none;
+  background-color: transparent;
+  box-shadow: inset 0 0 0 1000px rgba(255, 255, 255, 0.15);
 }
 
 #panel .panel-button:hover.clock-display {
   box-shadow: none;
+  background-color: transparent;
 }
 
 #panel .panel-button:hover.clock-display .clock {
-  background-color: none;
-  box-shadow: none;
+  box-shadow: inset 0 0 0 1000px rgba(255, 255, 255, 0.15);
 }
 
 #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
-  background-color: rgba(255, 255, 255, 0.3);
-  box-shadow: none;
+  background-color: transparent;
+  box-shadow: inset 0 0 0 1000px rgba(255, 255, 255, 0.3);
 }
 
 #panel .panel-button:active.clock-display, #panel .panel-button:overview.clock-display, #panel .panel-button:focus.clock-display, #panel .panel-button:checked.clock-display {
   box-shadow: none;
+  background-color: transparent;
 }
 
 #panel .panel-button:active.clock-display .clock, #panel .panel-button:overview.clock-display .clock, #panel .panel-button:focus.clock-display .clock, #panel .panel-button:checked.clock-display .clock {
-  background-color: none;
-  box-shadow: none;
+  box-shadow: inset 0 0 0 1000px rgba(255, 255, 255, 0.3);
 }
 
 #panel .panel-button .system-status-icon {
@@ -1902,11 +1902,21 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   box-shadow: none;
 }
 
-#panel Gjs_ui_panel_AggregateMenu.panel-button,
 #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button {
+  border: none !important;
   margin: 2px !important;
 }
 
+#panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button:hover {
+  background-color: rgba(255, 255, 255, 0.15);
+  box-shadow: none;
+}
+
+#panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button:active, #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button:overview, #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button:focus, #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button:checked {
+  background-color: rgba(255, 255, 255, 0.3);
+  box-shadow: none;
+}
+
 #panel Gjs_ui_panel_AggregateMenu.panel-button .system-status-icon {
   margin: 0 0 !important;
   padding: 4px !important;
@@ -1917,18 +1927,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 0 !important;
 }
 
-#panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
-  box-shadow: none;
-}
-
-#panel.unlock-screen .panel-button:hover.clock-display, #panel.unlock-screen .panel-button:active.clock-display, #panel.unlock-screen .panel-button:overview.clock-display, #panel.unlock-screen .panel-button:focus.clock-display, #panel.unlock-screen .panel-button:checked.clock-display, #panel.login-screen .panel-button:hover.clock-display, #panel.login-screen .panel-button:active.clock-display, #panel.login-screen .panel-button:overview.clock-display, #panel.login-screen .panel-button:focus.clock-display, #panel.login-screen .panel-button:checked.clock-display, #panel:overview .panel-button:hover.clock-display, #panel:overview .panel-button:active.clock-display, #panel:overview .panel-button:overview.clock-display, #panel:overview .panel-button:focus.clock-display, #panel:overview .panel-button:checked.clock-display {
-  box-shadow: none;
-}
-
-#panel.unlock-screen .panel-button:hover.clock-display .clock, #panel.unlock-screen .panel-button:active.clock-display .clock, #panel.unlock-screen .panel-button:overview.clock-display .clock, #panel.unlock-screen .panel-button:focus.clock-display .clock, #panel.unlock-screen .panel-button:checked.clock-display .clock, #panel.login-screen .panel-button:hover.clock-display .clock, #panel.login-screen .panel-button:active.clock-display .clock, #panel.login-screen .panel-button:overview.clock-display .clock, #panel.login-screen .panel-button:focus.clock-display .clock, #panel.login-screen .panel-button:checked.clock-display .clock, #panel:overview .panel-button:hover.clock-display .clock, #panel:overview .panel-button:active.clock-display .clock, #panel:overview .panel-button:overview.clock-display .clock, #panel:overview .panel-button:focus.clock-display .clock, #panel:overview .panel-button:checked.clock-display .clock {
-  box-shadow: none;
-}
-
 #panel .panel-status-indicators-box,
 #panel .panel-status-menu-box {
   spacing: 2px;
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-dark.css b/src/gnome-shell/shell-40-0/gnome-shell-dark.css
index 669b5dd..d93172f 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-dark.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-dark.css
@@ -1824,37 +1824,37 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -natural-hpadding: 6px;
   -minimum-hpadding: 6px;
   transition-duration: 150ms;
-  border: none;
+  border: 3px solid transparent;
   border-radius: 9999px;
-  margin: 3px 0;
+  margin: 0;
 }
 
 #panel .panel-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
-  box-shadow: none;
+  background-color: transparent;
+  box-shadow: inset 0 0 0 1000px rgba(255, 255, 255, 0.15);
 }
 
 #panel .panel-button:hover.clock-display {
   box-shadow: none;
+  background-color: transparent;
 }
 
 #panel .panel-button:hover.clock-display .clock {
-  background-color: none;
-  box-shadow: none;
+  box-shadow: inset 0 0 0 1000px rgba(255, 255, 255, 0.15);
 }
 
 #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
-  background-color: rgba(255, 255, 255, 0.3);
-  box-shadow: none;
+  background-color: transparent;
+  box-shadow: inset 0 0 0 1000px rgba(255, 255, 255, 0.3);
 }
 
 #panel .panel-button:active.clock-display, #panel .panel-button:overview.clock-display, #panel .panel-button:focus.clock-display, #panel .panel-button:checked.clock-display {
   box-shadow: none;
+  background-color: transparent;
 }
 
 #panel .panel-button:active.clock-display .clock, #panel .panel-button:overview.clock-display .clock, #panel .panel-button:focus.clock-display .clock, #panel .panel-button:checked.clock-display .clock {
-  background-color: none;
-  box-shadow: none;
+  box-shadow: inset 0 0 0 1000px rgba(255, 255, 255, 0.3);
 }
 
 #panel .panel-button .system-status-icon {
@@ -1902,11 +1902,21 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   box-shadow: none;
 }
 
-#panel Gjs_ui_panel_AggregateMenu.panel-button,
 #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button {
+  border: none !important;
   margin: 3px !important;
 }
 
+#panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button:hover {
+  background-color: rgba(255, 255, 255, 0.15);
+  box-shadow: none;
+}
+
+#panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button:active, #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button:overview, #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button:focus, #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button:checked {
+  background-color: rgba(255, 255, 255, 0.3);
+  box-shadow: none;
+}
+
 #panel Gjs_ui_panel_AggregateMenu.panel-button .system-status-icon {
   margin: 0 0 !important;
   padding: 6px !important;
@@ -1917,18 +1927,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 0 !important;
 }
 
-#panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
-  box-shadow: none;
-}
-
-#panel.unlock-screen .panel-button:hover.clock-display, #panel.unlock-screen .panel-button:active.clock-display, #panel.unlock-screen .panel-button:overview.clock-display, #panel.unlock-screen .panel-button:focus.clock-display, #panel.unlock-screen .panel-button:checked.clock-display, #panel.login-screen .panel-button:hover.clock-display, #panel.login-screen .panel-button:active.clock-display, #panel.login-screen .panel-button:overview.clock-display, #panel.login-screen .panel-button:focus.clock-display, #panel.login-screen .panel-button:checked.clock-display, #panel:overview .panel-button:hover.clock-display, #panel:overview .panel-button:active.clock-display, #panel:overview .panel-button:overview.clock-display, #panel:overview .panel-button:focus.clock-display, #panel:overview .panel-button:checked.clock-display {
-  box-shadow: none;
-}
-
-#panel.unlock-screen .panel-button:hover.clock-display .clock, #panel.unlock-screen .panel-button:active.clock-display .clock, #panel.unlock-screen .panel-button:overview.clock-display .clock, #panel.unlock-screen .panel-button:focus.clock-display .clock, #panel.unlock-screen .panel-button:checked.clock-display .clock, #panel.login-screen .panel-button:hover.clock-display .clock, #panel.login-screen .panel-button:active.clock-display .clock, #panel.login-screen .panel-button:overview.clock-display .clock, #panel.login-screen .panel-button:focus.clock-display .clock, #panel.login-screen .panel-button:checked.clock-display .clock, #panel:overview .panel-button:hover.clock-display .clock, #panel:overview .panel-button:active.clock-display .clock, #panel:overview .panel-button:overview.clock-display .clock, #panel:overview .panel-button:focus.clock-display .clock, #panel:overview .panel-button:checked.clock-display .clock {
-  box-shadow: none;
-}
-
 #panel .panel-status-indicators-box,
 #panel .panel-status-menu-box {
   spacing: 2px;
diff --git a/src/gnome-shell/shell-40-0/gnome-shell.css b/src/gnome-shell/shell-40-0/gnome-shell.css
index 05accf0..9ae26f4 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell.css
@@ -1824,37 +1824,37 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -natural-hpadding: 6px;
   -minimum-hpadding: 6px;
   transition-duration: 150ms;
-  border: none;
+  border: 3px solid transparent;
   border-radius: 9999px;
-  margin: 3px 0;
+  margin: 0;
 }
 
 #panel .panel-button:hover {
-  background-color: rgba(255, 255, 255, 0.15);
-  box-shadow: none;
+  background-color: transparent;
+  box-shadow: inset 0 0 0 1000px rgba(255, 255, 255, 0.15);
 }
 
 #panel .panel-button:hover.clock-display {
   box-shadow: none;
+  background-color: transparent;
 }
 
 #panel .panel-button:hover.clock-display .clock {
-  background-color: none;
-  box-shadow: none;
+  box-shadow: inset 0 0 0 1000px rgba(255, 255, 255, 0.15);
 }
 
 #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
-  background-color: rgba(255, 255, 255, 0.3);
-  box-shadow: none;
+  background-color: transparent;
+  box-shadow: inset 0 0 0 1000px rgba(255, 255, 255, 0.3);
 }
 
 #panel .panel-button:active.clock-display, #panel .panel-button:overview.clock-display, #panel .panel-button:focus.clock-display, #panel .panel-button:checked.clock-display {
   box-shadow: none;
+  background-color: transparent;
 }
 
 #panel .panel-button:active.clock-display .clock, #panel .panel-button:overview.clock-display .clock, #panel .panel-button:focus.clock-display .clock, #panel .panel-button:checked.clock-display .clock {
-  background-color: none;
-  box-shadow: none;
+  box-shadow: inset 0 0 0 1000px rgba(255, 255, 255, 0.3);
 }
 
 #panel .panel-button .system-status-icon {
@@ -1902,11 +1902,21 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   box-shadow: none;
 }
 
-#panel Gjs_ui_panel_AggregateMenu.panel-button,
 #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button {
+  border: none !important;
   margin: 3px !important;
 }
 
+#panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button:hover {
+  background-color: rgba(255, 255, 255, 0.15);
+  box-shadow: none;
+}
+
+#panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button:active, #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button:overview, #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button:focus, #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button:checked {
+  background-color: rgba(255, 255, 255, 0.3);
+  box-shadow: none;
+}
+
 #panel Gjs_ui_panel_AggregateMenu.panel-button .system-status-icon {
   margin: 0 0 !important;
   padding: 6px !important;
@@ -1917,18 +1927,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 0 !important;
 }
 
-#panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
-  box-shadow: none;
-}
-
-#panel.unlock-screen .panel-button:hover.clock-display, #panel.unlock-screen .panel-button:active.clock-display, #panel.unlock-screen .panel-button:overview.clock-display, #panel.unlock-screen .panel-button:focus.clock-display, #panel.unlock-screen .panel-button:checked.clock-display, #panel.login-screen .panel-button:hover.clock-display, #panel.login-screen .panel-button:active.clock-display, #panel.login-screen .panel-button:overview.clock-display, #panel.login-screen .panel-button:focus.clock-display, #panel.login-screen .panel-button:checked.clock-display, #panel:overview .panel-button:hover.clock-display, #panel:overview .panel-button:active.clock-display, #panel:overview .panel-button:overview.clock-display, #panel:overview .panel-button:focus.clock-display, #panel:overview .panel-button:checked.clock-display {
-  box-shadow: none;
-}
-
-#panel.unlock-screen .panel-button:hover.clock-display .clock, #panel.unlock-screen .panel-button:active.clock-display .clock, #panel.unlock-screen .panel-button:overview.clock-display .clock, #panel.unlock-screen .panel-button:focus.clock-display .clock, #panel.unlock-screen .panel-button:checked.clock-display .clock, #panel.login-screen .panel-button:hover.clock-display .clock, #panel.login-screen .panel-button:active.clock-display .clock, #panel.login-screen .panel-button:overview.clock-display .clock, #panel.login-screen .panel-button:focus.clock-display .clock, #panel.login-screen .panel-button:checked.clock-display .clock, #panel:overview .panel-button:hover.clock-display .clock, #panel:overview .panel-button:active.clock-display .clock, #panel:overview .panel-button:overview.clock-display .clock, #panel:overview .panel-button:focus.clock-display .clock, #panel:overview .panel-button:checked.clock-display .clock {
-  box-shadow: none;
-}
-
 #panel .panel-status-indicators-box,
 #panel .panel-status-menu-box {
   spacing: 2px;