better tabs

1 files changed, 31 insertions, 31 deletions

diff --git a/common/gtk-3.0/3.14/_applications.scss b/common/gtk-3.0/3.14/_applications.scss
index db21334..adc6645 100644
--- a/common/gtk-3.0/3.14/_applications.scss
+++ b/common/gtk-3.0/3.14/_applications.scss
@@ -31,34 +31,37 @@ TerminalWindow {
     background-color: transparent;
   }
 
-  .notebook tab.reorderable-page,
-  .notebook tab.reorderable-page:hover {
-    padding-top: 4px;
-    padding-bottom: 4px;
-  }
-
   .notebook {
 
     &.header.top {
       box-shadow: inset 0  1px opacify($header_border, 1),
-                  inset 0 -1px if($variant == 'light', lighten($borders_color, 5%), lighten($borders_color, 1%));
+                  inset 0 -1px $borders_color;
     }
 
-    tab {
-      .active-page GtkLabel {
-        color: $header_fg;
-
-        &:backdrop { color: transparentize($header_fg, 0.3); }
-      }
-
-      &.reorderable-page.top:active,
-      &.reorderable-page.top:active:hover {
-        background-color: opacify($header_bg, 1);
-        border-color: opacify($header_border, 1);
-
-        &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+/*    tab {
+      &.reorderable-page.top, &.top {
+        border-width: 1px;
+        border-color: transparent;
+        box-shadow: none;
+        &:hover, &.prelight-page {
+          border-color: transparentize($borders_color, 0.5);
+          border-width: 1px;
+          border-top-width: 0;
+          background-color: transparentize($bg_color,0.8);
+          box-shadow: none;
+        }
+        &:active, &.active-page, &.active-page:hover {
+          border-width: 1px;
+          border-top-width: 0;
+          border-color: $header_border;
+          background-color: opacify($header_bg, 1);
+          box-shadow: none;
+
+          &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+        }
       }
     }
+*/
   }
 
   .scrollbar {
@@ -102,6 +105,7 @@ NautilusNotebook.notebook {
 NautilusQueryEditor .search-bar.toolbar {
   padding: 5px;
   box-shadow: none;
+  background-color: $base_color;
 }
 
 
@@ -226,17 +230,13 @@ GbSearchBox.linked {
 
   > GtkMenuButton.button:last-child:dir(ltr),
   > GtkMenuButton.button:first-child:dir(rtl) {
-    border-color: transparentize($header_fg, 0.7);
-    background-color: transparentize($button_bg, 0.1);
+    padding: 0 10px;
 
-    &:hover {
-      border-color: $selected_bg_color;
-    }
-    &:active, &:checked {
-      color: $selected_fg_color;
-      background-color: $selected_bg_color;
-      border-color: $selected_bg_color;
-    }
+    @include entry(header-normal);
+
+    &:hover { @include entry(header-normal); border-color: $selected_bg_color; }
+    &:active, &:checked { @include entry(header-focus); }
+    &:insensitive { @include entry(header-insensitive); }
   }
 
   > GtkMenuButton.button:last-child:dir(ltr) {
@@ -673,7 +673,7 @@ PantheonTerminalPantheonTerminalWindow.background {
 
     &.header.top {
       box-shadow: inset 0  1px opacify($header_border, 1),
-                  inset 0 -1px if($variant == 'light', lighten($borders_color, 5%), lighten($borders_color, 1%));
+                  inset 0 -1px $borders_color;
     }
   }
 }