From 4090a93776ea064ea9c3d388eaa508cd75486bfd Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sat, 12 Apr 2025 20:32:28 +0800
Subject: [PATCH] update

---
 libs/lib-core.sh              | 14 +++++++-------
 src/sass/gtk/_common-4.0.scss |  2 ++
 src/sass/gtk/apps/_misc.scss  | 12 ++++++++----
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/libs/lib-core.sh b/libs/lib-core.sh
index 93b24039..2249a14c 100755
--- a/libs/lib-core.sh
+++ b/libs/lib-core.sh
@@ -27,19 +27,19 @@ 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
-    GS_VERSION="48-0"
+    GNOME_VERSION="48-0"
   elif [[ "${SHELL_VERSION:-}" -ge "47" ]]; then
-    GS_VERSION="47-0"
+    GNOME_VERSION="47-0"
   elif [[ "${SHELL_VERSION:-}" -ge "46" ]]; then
-    GS_VERSION="46-0"
+    GNOME_VERSION="46-0"
   elif [[ "${SHELL_VERSION:-}" -ge "44" ]]; then
-    GS_VERSION="44-0"
+    GNOME_VERSION="44-0"
   elif [[ "${SHELL_VERSION:-}" -ge "42" ]]; then
-    GS_VERSION="42-0"
+    GNOME_VERSION="42-0"
   elif [[ "${SHELL_VERSION:-}" -ge "40" ]]; then
-    GS_VERSION="40-0"
+    GNOME_VERSION="40-0"
   else
-    GS_VERSION="3-28"
+    GNOME_VERSION="3-28"
   fi
 else
   GNOME_VERSION="48-0"
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 9b91e06a..062021fd 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -2372,6 +2372,8 @@ headerbar {
 
     > windowhandle > box {
       padding: 0 $container_padding / 2;
+      margin-top: 0;
+      margin-bottom: 0;
     }
 
     .tiled &,
diff --git a/src/sass/gtk/apps/_misc.scss b/src/sass/gtk/apps/_misc.scss
index 859d0824..4dbdab02 100644
--- a/src/sass/gtk/apps/_misc.scss
+++ b/src/sass/gtk/apps/_misc.scss
@@ -264,7 +264,7 @@ window.background.chromium {
 //
 // Libre-Office
 //
-window.background:not(.solid-csd):not(.csd) {
+window.background:not(.solid-csd) {
   // reserved area at the most-right side of GtkMenuBar
   > grid.horizontal > grid.horizontal {
     background-color: $header_bg;
@@ -296,13 +296,13 @@ window.background:not(.solid-csd):not(.csd) {
 
   > grid.horizontal > widget > widget {
     viewport.frame > box > box > box > grid toolbar {
-      background: none;
+      background-color: transparent;
       border: none;
       padding: 3px;
     }
 
     > scrolledwindow > viewport.frame {
-      background: $base_color;
+      background-color: $base_color;
 
       > grid > box.vertical {
         > toolbar {
@@ -313,7 +313,7 @@ window.background:not(.solid-csd):not(.csd) {
       }
 
       > grid > box.horizontal > #combobox.linked,
-      > grid > box.horizontal > grid.horizontal > box.horizontal { background: $base_color; }
+      > grid > box.horizontal > grid.horizontal > box.horizontal { background-color: $base_color; }
     }
 
     toolbar.small-button {
@@ -403,6 +403,10 @@ toolbar.toolbar {
       background-color: if($variant == 'light', mix(black, $bg_color, 5%), mix(white, $bg_color, 5%));
       border-color: transparent;
     }
+
+    &:disabled {
+      color: $disabled_fg_color;
+    }
   }
 }