From 8cdeb3bac54eac675d1a8bf36e066f54bb9e903a Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Mon, 14 Jul 2025 14:12:28 +0800
Subject: [PATCH] Fixed #1314

---
 src/sass/_colors.scss                |  2 +-
 src/sass/gtk/_colors-libadwaita.scss |  2 --
 src/sass/gtk/apps/_gnome-3.22.scss   |  4 ++--
 src/sass/gtk/apps/_gnome-40.0.scss   | 25 ++++++++++++++-----------
 src/sass/gtk/apps/_libadwaita.scss   |  4 ++--
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss
index 1cfd396d..b00124d9 100644
--- a/src/sass/_colors.scss
+++ b/src/sass/_colors.scss
@@ -294,7 +294,7 @@ $button_borders:                    if($variant == 'light', $button_border, $dar
 $wm_outline_light:                  0 0 0 2px rgba(black, 0.03), 0 0 0 1px rgba(black, 0.12);
 $wm_outline_dark:                   0 0 0 2px rgba(black, 0.1), 0 0 0 1px rgba(black, 0.75);
 $wm_border:                         if($variant=='light', rgba(black, 0.15), rgba(black, 0.75));
-$wm_shadow:                         if($variant=='light', rgba(black, 0.15), rgba(black, 0.35));
+$wm_shadow:                         if($variant=='light', rgba(black, 0.13), rgba(black, 0.2));
 $wm_shadow_backdrop:                if($variant=='light', rgba(black, 0.08), rgba(black, 0.15));
 $wm_outline:                        if($variant=='light', $wm_outline_light, $wm_outline_dark);
 
diff --git a/src/sass/gtk/_colors-libadwaita.scss b/src/sass/gtk/_colors-libadwaita.scss
index cfa3cc75..111f35cb 100644
--- a/src/sass/gtk/_colors-libadwaita.scss
+++ b/src/sass/gtk/_colors-libadwaita.scss
@@ -296,8 +296,6 @@ $dark_5: #000000;
   $menu_fg: gtkcolor(popover_fg_color);
   $menu_bd: if($variant == 'light', gtkalpha(currentColor, 0.08), gtkalpha(currentColor, 0.07));
 
-  $wm_shadow: gtkcolor(headerbar_shade_color);
-  $wm_shadow_backdrop: gtkcolor(sidebar_shade_color);
   $wm_outline: 0 0 0 2px rgba(black, 0.03), 0 0 0 1px gtkcolor(headerbar_darker_shade_color);
   $wm_border: gtkcolor(headerbar_darker_shade_color);
 
diff --git a/src/sass/gtk/apps/_gnome-3.22.scss b/src/sass/gtk/apps/_gnome-3.22.scss
index 8d7afc09..6f9a86e9 100644
--- a/src/sass/gtk/apps/_gnome-3.22.scss
+++ b/src/sass/gtk/apps/_gnome-3.22.scss
@@ -20,8 +20,8 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
 @if $nautilus_style == 'stable' {
   $nautilus_sidebar_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
                                                   $dark_sidebar_bg $nautilus_sidebar_size,
-                                                  tranparent $nautilus_sidebar_size,
-                                                  tranparent 100%);
+                                                  transparent $nautilus_sidebar_size,
+                                                  transparent 100%);
 
   $nautilus_bg_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
                                              $dark_sidebar_bg $nautilus_sidebar_size,
diff --git a/src/sass/gtk/apps/_gnome-40.0.scss b/src/sass/gtk/apps/_gnome-40.0.scss
index 461603e1..63918018 100644
--- a/src/sass/gtk/apps/_gnome-40.0.scss
+++ b/src/sass/gtk/apps/_gnome-40.0.scss
@@ -1306,7 +1306,7 @@ panelresizer .top-bar {
 }
 
 .frameheader.header:not(.vertical) {
-  min-height: $medium_size;
+  min-height: $menuitem_size;
   padding: 0;
   border: none;
   border-bottom: 1px solid $borders_color;
@@ -1316,27 +1316,30 @@ panelresizer .top-bar {
     background-color: color-mix(in srgb, black 7%, $base_color);
   }
 
-  tabbar.inline {
-    tabbox {
-      min-height: $medium_size;
+  tabbar {
+    .box {
+      min-height: $menuitem_size;
+      border: none;
     }
 
-    .start-action {
-      padding: $container_padding / 2 $container_padding / 2 $container_padding / 2 $container_padding;
-    }
+    .start-action, .end-action {
+      padding: $base_padding / 2;
 
-    .end-action {
-      padding: $container_padding / 2 $container_padding $container_padding / 2 $container_padding / 2;
+      button {
+        min-height: 20px;
+        min-width: 20px;
+        padding: $base_padding / 2;
+      }
     }
   }
 }
 
 panelframeswitcher:not(.vertical) {
-  &.frameheader.header { padding: 0 $base_padding; }
+  &.frameheader.header { padding: $container_padding / 2; }
 
   > button.toggle.image-button {
     border: none;
-    margin: $base_padding 0;
+    margin: 0;
   }
 }
 
diff --git a/src/sass/gtk/apps/_libadwaita.scss b/src/sass/gtk/apps/_libadwaita.scss
index 8a66a6f1..a36184cc 100644
--- a/src/sass/gtk/apps/_libadwaita.scss
+++ b/src/sass/gtk/apps/_libadwaita.scss
@@ -516,8 +516,8 @@ tabbar {
         @if $monterey == 'false' {
           min-height: $small_size;
           min-width: $small_size;
-          margin-top: 2px;
-          margin-bottom: 2px;
+          margin-top: 0;
+          margin-bottom: 0;
         } @else {
           min-height: 16px;
           min-width: 16px;