From 7c7f5e65b9ba7f22a13ff00083b6b5b3a57e00f7 Mon Sep 17 00:00:00 2001
From: Vince <vinceliuice@hotmail.com>
Date: Fri, 20 Aug 2021 10:34:05 +0800
Subject: [PATCH] Fixed #403

---
 lib-core.sh                             |  2 +-
 src/sass/gnome-shell/common/_panel.scss | 76 ++++++++++++++-----------
 2 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/lib-core.sh b/lib-core.sh
index 3ab08aad..cef86e8f 100755
--- a/lib-core.sh
+++ b/lib-core.sh
@@ -546,7 +546,7 @@ check_param() {
           fi
         done ;;
       -i)
-        for i in {0..8}; do
+        for i in {0..12}; do
           if [[ "${value}" == "${ICON_VARIANTS[i]}" ]]; then
             icon="${ICON_VARIANTS[i]}"; variant_found="true"; break
           fi
diff --git a/src/sass/gnome-shell/common/_panel.scss b/src/sass/gnome-shell/common/_panel.scss
index e50c0e20..33a429b3 100644
--- a/src/sass/gnome-shell/common/_panel.scss
+++ b/src/sass/gnome-shell/common/_panel.scss
@@ -11,37 +11,6 @@
   transition-duration: 250ms;
   @include font(body-1);
 
-  // transparent panel on lock & login screens
-  &:overview,
-  &.unlock-screen,
-  &.login-screen,
-  &.lock-screen {
-    background-color: if($trans == 'false' and $variant == 'light', transparent, transparent);
-    box-shadow: none;
-
-    StLabel, StIcon { color: $light_alt_fg_color; }
-
-    .panel-button {
-      &:hover {
-        color: $light_fg_color;
-        background-color: $light_divider_color;
-      }
-
-      &:active, &:overview, &:focus, &:checked {
-        &, &:hover {
-          color: $light_fg_color;
-          background-color: $light_track_color;
-        }
-      }
-    }
-
-    .panel-corner {
-      -panel-corner-radius: 0;
-      -panel-corner-background-color: transparent;
-      -panel-corner-border-color: transparent;
-    }
-  }
-
   // the rounded outset corners
   .panel-corner {
     -panel-corner-radius: 0;
@@ -83,6 +52,8 @@
       background-color: $panel_divider;
 
       &.clock-display {
+        background: none;
+
         .clock {
           background-color: $panel_divider;
         }
@@ -95,6 +66,8 @@
       box-shadow: none;
 
       &.clock-display {
+        background: none;
+
         .clock {
           background-color: $panel_track;
         }
@@ -131,7 +104,7 @@
       // we want to exclude the do-not-disturb indicator from the background
       &.clock-display {
         box-shadow: none;
-        background-color: transparent;
+        background-color: transparent !important;
 
         .clock {
           box-shadow: none;
@@ -178,10 +151,41 @@
     font-weight: bold !important;
   }
 
+  // transparent panel on lock & login screens
+  &:overview,
   &.unlock-screen,
   &.login-screen,
-  &:overview {
+  &.lock-screen {
+    background-color: if($trans == 'false' and $variant == 'light', transparent, transparent);
+    box-shadow: none;
+
+    StLabel, StIcon { color: $light_alt_fg_color; }
+
     .panel-button {
+      &:hover {
+        color: $light_fg_color;
+        background-color: $light_divider_color;
+
+        &.clock-display {
+          .clock {
+            background-color: $light_divider_color;
+          }
+        }
+      }
+
+      &:active, &:overview, &:focus, &:checked {
+        &, &:hover {
+          color: $light_fg_color;
+          background-color: $light_track_color;
+        }
+
+        &.clock-display {
+          .clock {
+            background-color: $light_track_color;
+          }
+        }
+      }
+
       &:hover, &:active, &:overview, &:focus, &:checked {
         box-shadow: none;
 
@@ -194,6 +198,12 @@
         }
       }
     }
+
+    .panel-corner {
+      -panel-corner-radius: 0;
+      -panel-corner-background-color: transparent;
+      -panel-corner-border-color: transparent;
+    }
   }
 
   .panel-status-indicators-box,