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
+  if [[ "${SHELL_VERSION:-}" -ge "40" ]]; then
-    GNOME_VERSION="48-0"
+    GNOME_VERSION="${SHELL_VERSION}-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"
   else
     GNOME_VERSION="3-28"
   fi

src/sass/gtk/_common-4.0.scss

@@ -2372,8 +2372,6 @@ headerbar {
 
     > windowhandle > box {
       padding: 0 $container_padding / 2;
-      margin-top: 0;
-      margin-bottom: 0;
     }
 
     .tiled &,

src/sass/gtk/apps/_misc.scss

@@ -264,7 +264,7 @@ window.background.chromium {
 //
 // Libre-Office
 //
-window.background:not(.solid-csd) {
+window.background:not(.solid-csd):not(.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) {
 
   > grid.horizontal > widget > widget {
     viewport.frame > box > box > box > grid toolbar {
-      background-color: transparent;
+      background: none;
       border: none;
       padding: 3px;
     }
 
     > scrolledwindow > viewport.frame {
-      background-color: $base_color;
+      background: $base_color;
 
       > grid > box.vertical {
         > toolbar {
@@ -313,7 +313,7 @@ window.background:not(.solid-csd) {
       }
 
       > grid > box.horizontal > #combobox.linked,
-      > grid > box.horizontal > grid.horizontal > box.horizontal { background-color: $base_color; }
+      > grid > box.horizontal > grid.horizontal > box.horizontal { background: $base_color; }
     }
 
     toolbar.small-button {
@@ -403,10 +403,6 @@ 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;
-    }
   }
 }