From 1b4893fc93789998a048c3db3c6a720330b74132 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sat, 12 Apr 2025 12:12:31 +0800
Subject: [PATCH] update

---
 libs/lib-core.sh                           | 14 ++------------
 src/sass/_colors.scss                      |  5 ++++-
 src/sass/gnome-shell/common/_popovers.scss |  2 --
 src/sass/gtk/apps/_gnome-40.0.scss         |  6 +-----
 src/sass/gtk/apps/_libadwaita.scss         | 10 +++++-----
 5 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/libs/lib-core.sh b/libs/lib-core.sh
index 2249a14c..bb9b1077 100755
--- a/libs/lib-core.sh
+++ b/libs/lib-core.sh
@@ -26,18 +26,8 @@ MY_HOME=$(getent passwd "${MY_USERNAME}" | cut -d: -f6)
 
 if command -v gnome-shell &> /dev/null; then
   SHELL_VERSION="$(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f -1)"
-  if [[ "${SHELL_VERSION:-}" -ge "48" ]]; then
-    GNOME_VERSION="48-0"
-  elif [[ "${SHELL_VERSION:-}" -ge "47" ]]; then
-    GNOME_VERSION="47-0"
-  elif [[ "${SHELL_VERSION:-}" -ge "46" ]]; then
-    GNOME_VERSION="46-0"
-  elif [[ "${SHELL_VERSION:-}" -ge "44" ]]; then
-    GNOME_VERSION="44-0"
-  elif [[ "${SHELL_VERSION:-}" -ge "42" ]]; then
-    GNOME_VERSION="42-0"
-  elif [[ "${SHELL_VERSION:-}" -ge "40" ]]; then
-    GNOME_VERSION="40-0"
+  if [[ "${SHELL_VERSION:-}" -ge "40" ]]; then
+    GNOME_VERSION="${SHELL_VERSION}-0"
   else
     GNOME_VERSION="3-28"
   fi
diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss
index ec559150..23879915 100644
--- a/src/sass/_colors.scss
+++ b/src/sass/_colors.scss
@@ -211,6 +211,9 @@ $menu_bd:                           if($variant == 'light', gtkalpha(currentColo
   $menu_bg:                         if($variant == 'light', gtkalpha($base_color, $opacity), gtkalpha($bg_color, $opacity));
 }
 
+$popover_opacity:                   if($trans == 'false', 1, if($shell_version == 'new', 0.92, 0.96));
+$popover_bg_color:                  if($variant == 'light', rgba($bg_color, $popover_opacity), rgba($base_color, $popover_opacity));
+
 $submenu_bg_color:                  if($variant == 'light', rgba(white, 1), rgba(white, 0.1));
 
 @if $trans=='true' {
@@ -316,4 +319,4 @@ $wm_button_maximize_bg:             if($variant == 'light', #28d33f, #59c837);
 $wm_button_maximize_hover_bg:       if($variant == 'light', #28d33f, #59c837);
 $wm_button_maximize_active_bg:      if($variant == 'light', #20a932, #47a02c);
 $wm_button_maximize_border:         if($variant == 'light', #20a932, #47a02c);
-$wm_icon_maximize_bg:               if($variant == 'light', #14691f, #2c641b);
\ No newline at end of file
+$wm_icon_maximize_bg:               if($variant == 'light', #14691f, #2c641b);
diff --git a/src/sass/gnome-shell/common/_popovers.scss b/src/sass/gnome-shell/common/_popovers.scss
index 825dfbac..7c9ebc09 100644
--- a/src/sass/gnome-shell/common/_popovers.scss
+++ b/src/sass/gnome-shell/common/_popovers.scss
@@ -1,8 +1,6 @@
 /* Popovers/Menus */
 
-$popover_opacity: if($trans == 'false', 1, if($shell_version == 'new', 0.92, 0.96));
 $popop_menuitem_radius: $po_radius - $base_padding;
-$popover_bg_color: if($variant == 'light', rgba($bg_color, $popover_opacity), rgba($base_color, $popover_opacity));
 
 //.the popover itself
 .popup-menu-boxpointer {
diff --git a/src/sass/gtk/apps/_gnome-40.0.scss b/src/sass/gtk/apps/_gnome-40.0.scss
index dc88c243..ebdfd75e 100644
--- a/src/sass/gtk/apps/_gnome-40.0.scss
+++ b/src/sass/gtk/apps/_gnome-40.0.scss
@@ -160,7 +160,7 @@ $flap_sidebar_size: 240px;
     listview.view {
       padding: 0;
       margin: 0;
-      border-spacing: 0;
+      border-spacing: $container_padding / 2;
 
       > row.activatable {
         padding: 0;
@@ -174,10 +174,6 @@ $flap_sidebar_size: 240px;
             padding: $container_padding $container_padding * 1.5;
           }
         }
-
-        + row {
-          margin-top: $container_padding / 2;
-        }
       }
     }
   }
diff --git a/src/sass/gtk/apps/_libadwaita.scss b/src/sass/gtk/apps/_libadwaita.scss
index e77c4bf9..cad87531 100644
--- a/src/sass/gtk/apps/_libadwaita.scss
+++ b/src/sass/gtk/apps/_libadwaita.scss
@@ -610,12 +610,12 @@ toolbarview.undershoot-bottom scrolledwindow {
 .unfolded stacksidebar.sidebar { border: none; }
 
 .sidebar-pane {
-  background-color: transparent;
+  background-color: $dark_sidebar_bg;
   color: $dark_sidebar_fg;
 
   &:backdrop {
-    background-color: transparent;
-    // transition: background-color $longer_duration $deceleration_curve;
+    background-color: $bg_color;
+    transition: background-color $longer_duration $deceleration_curve;
   }
 
   .sidebar,
@@ -709,8 +709,8 @@ toolbarview.undershoot-bottom scrolledwindow {
   color: $text_color;
 
   &:backdrop {
-    background-color: $base_color;
-    // transition: background-color $longer_duration $deceleration_curve;
+    background-color: $bg_color;
+    transition: background-color $longer_duration $deceleration_curve;
   }
 
   toolbarview.undershoot-top scrolledwindow {