2 files changed, 28 insertions, 27 deletions

diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index 6872d60..f47a285 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -117,6 +117,10 @@
   border-bottom: 1px solid $borders_color;
 }
 
+.nautilus-window notebook {
+  background-color: $base_color;
+}
+
 button.nautilus-circular-button.image-button {
   border-radius: 50%;
   -gtk-outline-radius: 50%;
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index 0602b21..4c92a7d 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -1603,18 +1603,19 @@ cursor-handle {
 //
 notebook {
   padding: 0;
-  background-color: $base_color;
   transition: all 200ms $ease-out-quad;
 
   &.frame {
     border: 1px solid $borders_color;
 
-    header { margin: -1px; }  // ugly hack to hide the borders around the header
+    > header { margin: -1px; }  // ugly hack to hide the borders around the header
+  }
+
+  > stack:not(:only-child) { // the :not(:only-child) is for "hidden" notebooks
+    background-color: $base_color;
   }
 
   > header {
-    $vpadding: 4px;
-    $hpadding: 15px;
     padding: 3px;
     background-color: $bg_color;
 
@@ -1628,16 +1629,16 @@ notebook {
       &.#{$_pos} {
         padding-#{$_bpos}: 0;
 
-        tab {
-          padding: $vpadding $hpadding;
+        > tabs > tab {
+          padding: 2px 10px;
+          min-width: 22px;
+          min-height: 22px;
+
+          outline-offset: -4px;
+
           border: 1px solid transparent;
           border-#{$_bpos}: none;
 
-          // nicer close button placement
-          &.reorderable-page {
-            padding-left: 12px;
-            padding-right: 12px;
-          }
           // tab overlap
           @if $_pos==top or $_pos==bottom { margin-right: -1px; }
           @else { margin-bottom: -1px; }
@@ -1652,26 +1653,26 @@ notebook {
     }
     // overflow arrows
     &.top, &.bottom {
-      tabs arrow.up {
+      > tabs > arrow.up {
         -gtk-icon-source: -gtk-icontheme('pan-end-symbolic');
         &:last-child { margin-left: 2px; }
       }
-      tabs arrow.down {
+      > tabs > arrow.down {
         -gtk-icon-source: -gtk-icontheme('pan-start-symbolic');
         &:first-child { margin-right: 2px; }
       }
     }
     &.left, &.right {
-      tabs arrow.up {
+      > tabs > arrow.up {
         -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
         &:last-child { margin-top: 2px; }
       }
-      tabs arrow.down {
+      > tabs > arrow.down {
         -gtk-icon-source: -gtk-icontheme('pan-up-symbolic');
         &:first-child { margin-bottom: 2px; }
       }
     }
-    tabs arrow {
+    > tabs > arrow {
       color: $insensitive_fg_color;
 
       &:hover { color: mix($fg_color, $insensitive_fg_color, 50%); }
@@ -1679,32 +1680,28 @@ notebook {
       &:disabled { color: transparentize($insensitive_fg_color,0.3); }
     }
     // tab colors
-    tab {
+    > tabs > tab {
+      color: $insensitive_fg_color;
       background-color: transparentize($base_color, 1);
 
-      label { color: $insensitive_fg_color; }
-
-      &:hover {
+      &:hover:not(:checked) {
+        color: mix($fg_color, $insensitive_fg_color, 50%);
         background-color: transparentize($base_color, 0.5);
         border-color: $borders_color;
-
-        label { color: mix($fg_color, $insensitive_fg_color, 50%); }
+        box-shadow: inset 0 -1px $borders_color;
       }
       &:checked {
+        color: $fg_color;
         background-color: $base_color;
         border-color: $borders_color;
-
-        label { color: $fg_color; }
       }
       // close button
-      button {
+      button.flat {
         min-height: 18px;
         min-width: 16px;
         padding: 0;
         color: mix($bg_color, $fg_color, 35%);
 
-        @extend %undecorated_button;
-
         &:hover {
           @extend %undecorated_button;
           color: lighten(red, 15%);