From ef6ac4fd65a2e79bb1059ed5ce43b68eda88dde1 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sun, 13 Dec 2020 12:56:16 +0800
Subject: [PATCH] update

---
 install.sh                                    | 14 ++++++++
 src/main/gnome-shell/gnome-shell-dark-alt.css | 18 +++++++++--
 .../gnome-shell-dark-solid-alt.css            | 18 +++++++++--
 .../gnome-shell/gnome-shell-dark-solid.css    | 18 +++++++++--
 src/main/gnome-shell/gnome-shell-dark.css     | 18 +++++++++--
 .../gnome-shell/gnome-shell-light-alt.css     | 18 +++++++++--
 .../gnome-shell-light-solid-alt.css           | 18 +++++++++--
 .../gnome-shell/gnome-shell-light-solid.css   | 18 +++++++++--
 src/main/gnome-shell/gnome-shell-light.css    | 18 +++++++++--
 src/sass/gnome-shell/_common.scss             | 32 ++++++++++++++++---
 10 files changed, 161 insertions(+), 29 deletions(-)

diff --git a/install.sh b/install.sh
index 89f681e..cb5d88d 100755
--- a/install.sh
+++ b/install.sh
@@ -272,6 +272,17 @@ install_dialog() {
   fi
 }
 
+install_depends() {
+  if [ ! "$(which glib-compile-resources 2> /dev/null)" ]; then
+    prompt -w "\n 'glib2.0' needs to be installed for this shell"
+    if has_command apt; then
+      sudo apt install libglib2.0-dev-bin
+    elif has_command dnf; then
+      sudo dnf install -y glib2-devel
+    fi
+  fi
+}
+
 run_sidebar_dialog() {
   if [[ -x /usr/bin/dialog ]]; then
     tui=$(dialog --backtitle "${THEME_NAME} gtk theme installer" \
@@ -518,6 +529,9 @@ while [[ $# -gt 0 ]]; do
 done
 
 install_theme() {
+  # install depends
+  install_depends
+
   for color in "${colors[@]-${COLOR_VARIANTS[@]}}"; do
     for opacity in "${opacities[@]-${OPACITY_VARIANTS[@]}}"; do
       for alt in "${alts[@]-${ALT_VARIANTS[@]}}"; do
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt.css b/src/main/gnome-shell/gnome-shell-dark-alt.css
index 01acdc3..f3dd7c5 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt.css
@@ -2821,19 +2821,31 @@ StWidget.focused .app-well-app-running-dot {
   background-color: transparent;
   color: #afafaf;
   font-weight: 500;
+  border-width: 0;
 }
 
 .notification-banner .notification-button:first-child {
-  border-radius: 0 0 0 2px;
+  border-radius: 0 0 0 6px;
 }
 
 .notification-banner .notification-button:last-child {
-  border-radius: 0 0 2px 0;
+  border-radius: 0 0 6px 0;
 }
 
-.notification-banner .notification-button:hover, .notification-banner .notification-buttonfocus {
+.notification-banner .notification-button:only-child, .notification-banner .notification-button:first-child:last-child {
+  border-radius: 0 0 6px 6px;
+}
+
+.notification-banner .notification-button:focus {
+  background-color: transparent;
+  color: #afafaf;
+  box-shadow: inset 0 0 0 2px rgba(255, 255, 255, 0.06);
+}
+
+.notification-banner .notification-button:hover, .notification-banner .notification-button:focus:hover {
   background-color: rgba(255, 255, 255, 0.06);
   color: #dedede;
+  box-shadow: none;
 }
 
 .notification-banner .notification-button:active {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
index 3a0e3fe..d2f0175 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
@@ -2821,19 +2821,31 @@ StWidget.focused .app-well-app-running-dot {
   background-color: transparent;
   color: #afafaf;
   font-weight: 500;
+  border-width: 0;
 }
 
 .notification-banner .notification-button:first-child {
-  border-radius: 0 0 0 2px;
+  border-radius: 0 0 0 6px;
 }
 
 .notification-banner .notification-button:last-child {
-  border-radius: 0 0 2px 0;
+  border-radius: 0 0 6px 0;
 }
 
-.notification-banner .notification-button:hover, .notification-banner .notification-buttonfocus {
+.notification-banner .notification-button:only-child, .notification-banner .notification-button:first-child:last-child {
+  border-radius: 0 0 6px 6px;
+}
+
+.notification-banner .notification-button:focus {
+  background-color: transparent;
+  color: #afafaf;
+  box-shadow: inset 0 0 0 2px rgba(255, 255, 255, 0.06);
+}
+
+.notification-banner .notification-button:hover, .notification-banner .notification-button:focus:hover {
   background-color: rgba(255, 255, 255, 0.06);
   color: #dedede;
+  box-shadow: none;
 }
 
 .notification-banner .notification-button:active {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid.css b/src/main/gnome-shell/gnome-shell-dark-solid.css
index 3a0e3fe..d2f0175 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid.css
@@ -2821,19 +2821,31 @@ StWidget.focused .app-well-app-running-dot {
   background-color: transparent;
   color: #afafaf;
   font-weight: 500;
+  border-width: 0;
 }
 
 .notification-banner .notification-button:first-child {
-  border-radius: 0 0 0 2px;
+  border-radius: 0 0 0 6px;
 }
 
 .notification-banner .notification-button:last-child {
-  border-radius: 0 0 2px 0;
+  border-radius: 0 0 6px 0;
 }
 
-.notification-banner .notification-button:hover, .notification-banner .notification-buttonfocus {
+.notification-banner .notification-button:only-child, .notification-banner .notification-button:first-child:last-child {
+  border-radius: 0 0 6px 6px;
+}
+
+.notification-banner .notification-button:focus {
+  background-color: transparent;
+  color: #afafaf;
+  box-shadow: inset 0 0 0 2px rgba(255, 255, 255, 0.06);
+}
+
+.notification-banner .notification-button:hover, .notification-banner .notification-button:focus:hover {
   background-color: rgba(255, 255, 255, 0.06);
   color: #dedede;
+  box-shadow: none;
 }
 
 .notification-banner .notification-button:active {
diff --git a/src/main/gnome-shell/gnome-shell-dark.css b/src/main/gnome-shell/gnome-shell-dark.css
index 01acdc3..f3dd7c5 100644
--- a/src/main/gnome-shell/gnome-shell-dark.css
+++ b/src/main/gnome-shell/gnome-shell-dark.css
@@ -2821,19 +2821,31 @@ StWidget.focused .app-well-app-running-dot {
   background-color: transparent;
   color: #afafaf;
   font-weight: 500;
+  border-width: 0;
 }
 
 .notification-banner .notification-button:first-child {
-  border-radius: 0 0 0 2px;
+  border-radius: 0 0 0 6px;
 }
 
 .notification-banner .notification-button:last-child {
-  border-radius: 0 0 2px 0;
+  border-radius: 0 0 6px 0;
 }
 
-.notification-banner .notification-button:hover, .notification-banner .notification-buttonfocus {
+.notification-banner .notification-button:only-child, .notification-banner .notification-button:first-child:last-child {
+  border-radius: 0 0 6px 6px;
+}
+
+.notification-banner .notification-button:focus {
+  background-color: transparent;
+  color: #afafaf;
+  box-shadow: inset 0 0 0 2px rgba(255, 255, 255, 0.06);
+}
+
+.notification-banner .notification-button:hover, .notification-banner .notification-button:focus:hover {
   background-color: rgba(255, 255, 255, 0.06);
   color: #dedede;
+  box-shadow: none;
 }
 
 .notification-banner .notification-button:active {
diff --git a/src/main/gnome-shell/gnome-shell-light-alt.css b/src/main/gnome-shell/gnome-shell-light-alt.css
index 890f306..eb17870 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt.css
@@ -2821,19 +2821,31 @@ StWidget.focused .app-well-app-running-dot {
   background-color: transparent;
   color: #424242;
   font-weight: 500;
+  border-width: 0;
 }
 
 .notification-banner .notification-button:first-child {
-  border-radius: 0 0 0 2px;
+  border-radius: 0 0 0 6px;
 }
 
 .notification-banner .notification-button:last-child {
-  border-radius: 0 0 2px 0;
+  border-radius: 0 0 6px 0;
 }
 
-.notification-banner .notification-button:hover, .notification-banner .notification-buttonfocus {
+.notification-banner .notification-button:only-child, .notification-banner .notification-button:first-child:last-child {
+  border-radius: 0 0 6px 6px;
+}
+
+.notification-banner .notification-button:focus {
+  background-color: transparent;
+  color: #424242;
+  box-shadow: inset 0 0 0 2px rgba(0, 0, 0, 0.12);
+}
+
+.notification-banner .notification-button:hover, .notification-banner .notification-button:focus:hover {
   background-color: rgba(0, 0, 0, 0.12);
   color: #242424;
+  box-shadow: none;
 }
 
 .notification-banner .notification-button:active {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt.css b/src/main/gnome-shell/gnome-shell-light-solid-alt.css
index e85c362..d479319 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt.css
@@ -2821,19 +2821,31 @@ StWidget.focused .app-well-app-running-dot {
   background-color: transparent;
   color: #424242;
   font-weight: 500;
+  border-width: 0;
 }
 
 .notification-banner .notification-button:first-child {
-  border-radius: 0 0 0 2px;
+  border-radius: 0 0 0 6px;
 }
 
 .notification-banner .notification-button:last-child {
-  border-radius: 0 0 2px 0;
+  border-radius: 0 0 6px 0;
 }
 
-.notification-banner .notification-button:hover, .notification-banner .notification-buttonfocus {
+.notification-banner .notification-button:only-child, .notification-banner .notification-button:first-child:last-child {
+  border-radius: 0 0 6px 6px;
+}
+
+.notification-banner .notification-button:focus {
+  background-color: transparent;
+  color: #424242;
+  box-shadow: inset 0 0 0 2px rgba(0, 0, 0, 0.12);
+}
+
+.notification-banner .notification-button:hover, .notification-banner .notification-button:focus:hover {
   background-color: rgba(0, 0, 0, 0.12);
   color: #242424;
+  box-shadow: none;
 }
 
 .notification-banner .notification-button:active {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid.css b/src/main/gnome-shell/gnome-shell-light-solid.css
index e85c362..d479319 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid.css
@@ -2821,19 +2821,31 @@ StWidget.focused .app-well-app-running-dot {
   background-color: transparent;
   color: #424242;
   font-weight: 500;
+  border-width: 0;
 }
 
 .notification-banner .notification-button:first-child {
-  border-radius: 0 0 0 2px;
+  border-radius: 0 0 0 6px;
 }
 
 .notification-banner .notification-button:last-child {
-  border-radius: 0 0 2px 0;
+  border-radius: 0 0 6px 0;
 }
 
-.notification-banner .notification-button:hover, .notification-banner .notification-buttonfocus {
+.notification-banner .notification-button:only-child, .notification-banner .notification-button:first-child:last-child {
+  border-radius: 0 0 6px 6px;
+}
+
+.notification-banner .notification-button:focus {
+  background-color: transparent;
+  color: #424242;
+  box-shadow: inset 0 0 0 2px rgba(0, 0, 0, 0.12);
+}
+
+.notification-banner .notification-button:hover, .notification-banner .notification-button:focus:hover {
   background-color: rgba(0, 0, 0, 0.12);
   color: #242424;
+  box-shadow: none;
 }
 
 .notification-banner .notification-button:active {
diff --git a/src/main/gnome-shell/gnome-shell-light.css b/src/main/gnome-shell/gnome-shell-light.css
index a72e28d..8f8c0e4 100644
--- a/src/main/gnome-shell/gnome-shell-light.css
+++ b/src/main/gnome-shell/gnome-shell-light.css
@@ -2821,19 +2821,31 @@ StWidget.focused .app-well-app-running-dot {
   background-color: transparent;
   color: #424242;
   font-weight: 500;
+  border-width: 0;
 }
 
 .notification-banner .notification-button:first-child {
-  border-radius: 0 0 0 2px;
+  border-radius: 0 0 0 6px;
 }
 
 .notification-banner .notification-button:last-child {
-  border-radius: 0 0 2px 0;
+  border-radius: 0 0 6px 0;
 }
 
-.notification-banner .notification-button:hover, .notification-banner .notification-buttonfocus {
+.notification-banner .notification-button:only-child, .notification-banner .notification-button:first-child:last-child {
+  border-radius: 0 0 6px 6px;
+}
+
+.notification-banner .notification-button:focus {
+  background-color: transparent;
+  color: #424242;
+  box-shadow: inset 0 0 0 2px rgba(0, 0, 0, 0.12);
+}
+
+.notification-banner .notification-button:hover, .notification-banner .notification-button:focus:hover {
   background-color: rgba(0, 0, 0, 0.12);
   color: #242424;
+  box-shadow: none;
 }
 
 .notification-banner .notification-button:active {
diff --git a/src/sass/gnome-shell/_common.scss b/src/sass/gnome-shell/_common.scss
index 8015507..c788a56 100644
--- a/src/sass/gnome-shell/_common.scss
+++ b/src/sass/gnome-shell/_common.scss
@@ -1917,7 +1917,7 @@ $popop_menuitem_radius: $wm_radius - 4px;
 /* OVERVIEW */
 
 #overview {
-  spacing: 24px; //
+  spacing: 24px;
   StScrollBar { @extend %overview_scrollbar; }
 }
 
@@ -2464,6 +2464,7 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba($base_color, 0.92);
   border: none;
   box-shadow: $shadow_2;
+
   &:hover { background-color: rgba($base_color, 0.95); }
   &:focus { background-color: $base_color; }
 
@@ -2476,16 +2477,37 @@ StWidget.focused .app-well-app-running-dot {
     border-top: 1px solid $borders_color;
     spacing: 1px;
   }
+
   .notification-button {
     min-height: 40px;
     padding: 0 16px;
     background-color: transparent;
     color: $alt_fg_color;
     font-weight: 500;
-    &:first-child { border-radius: 0 0 0 2px; }
-    &:last-child { border-radius: 0 0 2px 0; }
-    &:hover, &focus { background-color: $divider_color; color: $fg_color; }
-    &:active { background-color: $track_color; color: $fg_color; }
+    border-width: 0;
+
+    &:first-child { border-radius: 0 0 0 $bt_radius; }
+
+    &:last-child { border-radius: 0 0 $bt_radius 0; }
+
+    &:only-child, &:first-child:last-child { border-radius: 0 0 $bt_radius $bt_radius; }
+
+    &:focus {
+      background-color: transparent;
+      color: $alt_fg_color;
+      box-shadow: inset 0 0 0 2px $divider_color;
+    }
+
+    &:hover, &:focus:hover {
+      background-color: $divider_color;
+      color: $fg_color;
+      box-shadow: none;
+    }
+
+    &:active {
+      background-color: $track_color;
+      color: $fg_color;
+    }
   }
 }