From 455a15dff6a8303b6f3f8d940d41104105763c40 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Tue, 10 Jan 2023 00:45:02 +0800
Subject: [PATCH] Fixed #772

---
 src/sass/gtk/_common-4.0.scss      |  62 ----------------
 src/sass/gtk/apps/_gnome-40.0.scss |  10 +++
 src/sass/gtk/apps/_libadwaita.scss | 113 +++++++++++++++++++++++------
 3 files changed, 100 insertions(+), 85 deletions(-)

diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 9835c0b..c4b49bf 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -2916,68 +2916,6 @@ notebook {
   }
 }
 
-tabbox {
-  @if $monterey == 'false' {
-    background-color: darken($header_bg, 10%);
-    box-shadow: inset 0 -1px $borders_color;
-  } @else {
-    background-color: $header_bg;
-    border-bottom: 1px solid $borders_color;
-    padding: 0 $container_padding / 2 $container_padding / 2;
-  }
-
-  > tabboxchild {
-    margin: 0 -3px;
-    border-radius: 0;
-  }
-
-  > tab,
-  > tabboxchild > tab {
-    @if $monterey == 'false' {
-      @extend %tabs_tab;
-      border-top: none;
-      border-top: 1px solid $borders_color;
-      &:checked { border-top-color: $header_bg; }
-    } @else {
-      @extend %monterey_tab;
-
-      + tab {
-        margin-left: $container_padding / 2;
-      }
-    }
-
-    button.tab-close-button {
-      border-radius: 3px;
-      border: none;
-      padding: 0;
-      @extend %flat_button;
-
-      @if $monterey == 'false' {
-        min-height: $small_size;
-        min-width: $small_size;
-        margin-top: 2px;
-        margin-bottom: 2px;
-      } @else {
-        min-height: 16px;
-        min-width: 16px;
-        margin-top: 4px;
-        margin-bottom: 4px;
-        margin-right: -$container_padding;
-      }
-
-      &:hover {
-        color: $fg_color;
-        background-color: rgba($borders_color, 0.1);
-      }
-
-      &:active, &:active:hover {
-        color: if($variant == 'light', darken($fg_color, 10%), lighten($fg_color, 10%));
-        background-color: rgba($borders_color, 0.2);
-      }
-    }
-  }
-}
-
 //
 // Scrollbars
 //
diff --git a/src/sass/gtk/apps/_gnome-40.0.scss b/src/sass/gtk/apps/_gnome-40.0.scss
index e936895..aef316d 100644
--- a/src/sass/gtk/apps/_gnome-40.0.scss
+++ b/src/sass/gtk/apps/_gnome-40.0.scss
@@ -72,6 +72,16 @@ $flap_sidebar_size: 240px;
     }
   }
 
+  tabbar:not(.inline) {
+    .box {
+      @if $monterey == 'false' {
+        background-color: mix(black, $base_color, 6%);
+      } @else {
+        background-color: $base_color;
+      }
+    }
+  }
+
   // Floating Bar
   .floating-bar {
     padding: 2px;
diff --git a/src/sass/gtk/apps/_libadwaita.scss b/src/sass/gtk/apps/_libadwaita.scss
index 944febc..d6afd19 100644
--- a/src/sass/gtk/apps/_libadwaita.scss
+++ b/src/sass/gtk/apps/_libadwaita.scss
@@ -277,20 +277,6 @@ tabbar {
     min-height: $menuitem_size;
   }
 
-  tabbox {
-    > separator {
-      &.hidden {
-        opacity: 0;
-      }
-    }
-
-    > revealer > indicator {
-      min-width: 2px;
-      border-radius: 2px;
-      background: gtkalpha($selected_bg_color, 0.5);
-    }
-  }
-
   .start-action,
   .end-action {
     padding: $container_padding;
@@ -308,17 +294,19 @@ tabbar {
 
   &:not(.inline) {
     .box {
-      background-color: $bg_color;
       color: $text_color;
-      margin-top: -1px;
+      margin: 0;
 
       @if $monterey == 'false' {
         padding: 0;
-        box-shadow: inset 0 -1px $borders_color;
+        box-shadow: inset 0 -1px if($variant == 'light', darken($header_bg, 15%), lighten($header_bg, 5%));
         border-bottom: none;
+        background-color: darken($header_bg, 10%);
       } @else {
+        box-shadow: none;
         border-bottom: 1px solid $borders_color;
-        padding: 0 $container_padding / 2 $container_padding / 2;
+        padding: $container_padding / 2 0;
+        background-color: $header_bg;
       }
     }
 
@@ -330,6 +318,90 @@ tabbar {
       }
     }
   }
+
+  tabbox {
+    border: none;
+    padding: 0;
+    box-shadow: none;
+    background-color: transparent;
+
+    > separator {
+      &.hidden {
+        opacity: 0;
+      }
+    }
+
+    > revealer > indicator {
+      min-width: 2px;
+      border-radius: 2px;
+      background: gtkalpha($selected_bg_color, 0.5);
+    }
+
+    > tabboxchild {
+      border-radius: 0;
+      margin: 0;
+
+      @if $monterey == 'false' {
+        &:first-child > tab {
+          border-left: none;
+        }
+
+        &:last-child > tab {
+          border-right: none;
+        }
+      }
+    }
+
+    > tab,
+    > tabboxchild > tab {
+      @if $monterey == 'false' {
+        @extend %tabs_tab;
+        border-top: none;
+      } @else {
+        @extend %monterey_tab;
+      }
+
+      button.tab-close-button {
+        border-radius: 3px;
+        border: none;
+        padding: 0;
+        margin-right: -$container_padding / 2;
+        @extend %flat_button;
+
+        @if $monterey == 'false' {
+          min-height: $small_size;
+          min-width: $small_size;
+          margin-top: 2px;
+          margin-bottom: 2px;
+        } @else {
+          min-height: 16px;
+          min-width: 16px;
+          margin-top: 4px;
+          margin-bottom: 4px;
+        }
+
+        &:hover {
+          color: $fg_color;
+          background-color: rgba($borders_color, 0.1);
+        }
+
+        &:active, &:active:hover {
+          color: if($variant == 'light', darken($fg_color, 10%), lighten($fg_color, 10%));
+          background-color: rgba($borders_color, 0.2);
+        }
+      }
+    }
+  }
+
+  scrolledwindow:not(.pinned) {
+    tabbox > tabboxchild {
+      @if $monterey == 'false' {
+        margin: 0 -3px;
+      } @else {
+        margin: 0;
+      }
+    }
+  }
 }
 
 dnd tab {
@@ -342,17 +414,12 @@ dnd tab {
 tabbar,
 dnd {
   tab {
-    padding-right: $container_padding / 2;
     margin: 0;
 
     @if $monterey == 'false' {
       @extend %tabs_tab;
     } @else {
       @extend %monterey_tab;
-
-      + tab {
-        margin-left: $container_padding / 2;
-      }
     }
 
     button.tab-close-button {