1 files changed, 58 insertions, 65 deletions

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index ffb5d31cf5..ccd9115ecf 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1573,7 +1573,17 @@ notebook {
     border: 1px solid $borders_color;
     &:backdrop { border-color: $backdrop_borders_color; }
   }
+
   & header {
+    //vertical tab sizing
+    $vt_vpadding: 8px;
+    $vt_hpadding: 20px;
+    // horizontal tab sizing
+    $ht_vpadding: 5px;
+    $ht_hpadding: 20px;
+    $tab_indicator_size: 3px;
+    $_header_shade: inset 0 2px 3px -1px transparentize(black, 0.85);
+
     // FIXME: double borders in some case, can't fix it w/o a class tho
     // FIXME: doesn't work on dark var
     background-color: mix($bg_color, $borders_color, 70%);
@@ -1588,79 +1598,82 @@ notebook {
       &:backdrop { border-color: $backdrop_borders_color; }
     }
 
-    $_header_shade: inset 0 2px 3px -1px transparentize(black, 0.85);
     &.top {
       box-shadow: $_header_shade,
                   inset 0 -1px $borders_color; // border
       &:backdrop { box-shadow: inset 0 -1px $backdrop_borders_color; }
+      & tab {
+        padding: $vt_vpadding $vt_hpadding;
+        border-bottom-width: $tab_indicator_size;
+        &.reorderable-page {
+          padding-left: 12px;  // for a nicer close button
+          padding-right: 12px; // placement
+          border-left-width: 1px;
+          border-right-width: 1px;
+        }
+      }
     }
     &.bottom {
       box-shadow: $_header_shade,
                   inset 0 1px $borders_color;
       &:backdrop { box-shadow: inset 0 1px $backdrop_borders_color; }
+      & tab {
+        padding: $vt_vpadding $vt_hpadding;
+        border-top-width: $tab_indicator_size;
+        &.reorderable-page {
+          padding-left: 12px;  // for a nicer close button
+          padding-right: 12px; // placement
+          border-left-width: 1px;
+          border-right-width: 1px;
+        }
+      }
     }
     &.right {
       box-shadow: $_header_shade,
                   inset 1px 0 $borders_color;
       &:backdrop { box-shadow: inset 1px 0 $backdrop_borders_color; }
+      & tab {
+        padding: $ht_vpadding $ht_hpadding;
+        border-left-width: $tab_indicator_size;
+        &.reorderable-page {
+          border-bottom-width: 1px;
+          border-top-width: 1px;
+        }
+      }
     }
     &.left {
       box-shadow: $_header_shade,
                   inset -1px 0 $borders_color;
       &:backdrop { box-shadow: inset -1px 0 $backdrop_borders_color; }
+      & tab {
+        padding: $ht_vpadding $ht_hpadding;
+        border-right-width: $tab_indicator_size;
+        &.reorderable-page {
+          border-bottom-width: 1px;
+          border-top-width: 1px;
+        }
+      }
     }
     &:backdrop {
       // same color as backdrop pushed button
       background-color: $backdrop_dark_fill;
       box-shadow: none;
     }
-  }
-  //vertical tab sizing
-  $vt_vpadding: 8px;
-  $vt_hpadding: 20px;
-  // horizontal tab sizing
-  $ht_vpadding: 5px;
-  $ht_hpadding: 20px;
-  $tab_indicator_size: 3px;
-
-  & header.top tab {
-    padding: $vt_vpadding $vt_hpadding;
-    border-bottom-width: $tab_indicator_size;
-    &.reorderable-page {
-        padding-left: 12px;  // for a nicer close button
-        padding-right: 12px; // placement
-        border-left-width: 1px;
-        border-right-width: 1px;
-    }
-  }
-  & header.bottom tab {
-    padding: $vt_vpadding $vt_hpadding;
-    border-top-width: $tab_indicator_size;
-    &.reorderable-page {
-        padding-left: 12px;  // for a nicer close button
-        padding-right: 12px; // placement
-        border-left-width: 1px;
-        border-right-width: 1px;
-    }
-  }
-  & header.left tab {
-    padding: $ht_vpadding $ht_hpadding;
-    border-right-width: $tab_indicator_size;
-    &.reorderable-page {
-      border-bottom-width: 1px;
-      border-top-width: 1px;
-    }
-  }
-  & header.right tab {
-    padding: $ht_vpadding $ht_hpadding;
-    border-left-width: $tab_indicator_size;
-    &.reorderable-page {
-      border-bottom-width: 1px;
-      border-top-width: 1px;
+    & tabs arrow {
+      -gtk-icon-source: -gtk-icontheme('pan-end-symbolic');
+      color: $insensitive_fg_color;
+      &:hover { color: mix($fg_color, $insensitive_fg_color, 50%); }
+      &:active { color: $fg_color; }
+      &:insensitive {
+        -gtk-icon-source: -gtk-icontheme('pan-end-symbolic');
+        color: transparentize($insensitive_fg_color,0.7);
+      }
+      &:backdrop { color: transparentize($backdrop_fg_color,0.6); }
+      &:backdrop:insensitive { color: $backdrop_insensitive_color; }
     }
   }
 
-  tab {
+  & tab {
     border-width: 0;
     border-style: solid;
     border-color: transparent;
@@ -1754,26 +1767,6 @@ notebook {
   }
 }
 
-notebook header tabs arrow.arrow {
-      -gtk-icon-source: -gtk-icontheme('pan-end-symbolic');
-      color: red; //$insensitive_fg_color;
-      &:hover {
-        color: mix($fg_color, $insensitive_fg_color, 50%);
-      }
-      &:active {
-        color: green; //$fg_color;
-      }
-      &:insensitive {
-        color: blue; //transparentize($insensitive_fg_color,0.7);
-      }
-      &:backdrop {
-        color: brown; //transparentize($backdrop_fg_color,0.6);
-        &:insensitive {
-          color: $backdrop_insensitive_color;
-        }
-      }
-}
-
 /**************
  * Scrollbars *
  **************/