1 files changed, 9 insertions, 14 deletions

diff --git a/common/gtk-3.0/3.16/_applications.scss b/common/gtk-3.0/3.16/_applications.scss
index 35b468a..848da06 100644
--- a/common/gtk-3.0/3.16/_applications.scss
+++ b/common/gtk-3.0/3.16/_applications.scss
@@ -40,8 +40,8 @@ TerminalWindow {
   .notebook {
 
     &.header.top {
-      box-shadow: inset 0  1px darken(opacify($header_bg, 1), 7%),
-                  inset 0 -1px lighten($borders_color, 5%);
+      box-shadow: inset 0  1px opacify($header_border, 1),
+                  inset 0 -1px if($variant == 'light', lighten($borders_color, 5%), lighten($borders_color, 1%));
     }
 
     tab {
@@ -51,16 +51,12 @@ TerminalWindow {
         &:backdrop { color: transparentize($header_fg, 0.3); }
       }
 
-      &.reorderable-page.top:hover {
-        border-bottom-color: darken(opacify($header_bg, 1), 7%);
-      }
-
       &.reorderable-page.top:active,
       &.reorderable-page.top:active:hover {
         background-color: opacify($header_bg, 1);
-        border-color: darken(opacify($header_bg, 1), 7%);
+        border-color: opacify($header_border, 1);
 
-        &:backdrop { background-color: lighten($header_bg, 3%); }
+        &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
       }
     }
   }
@@ -167,7 +163,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button {
 //
 // Gedit
 //
-.gedit-headerbar-paned { color: darken($header_bg, 7%); }
+.gedit-headerbar-paned { color: $header_border; }
 
 .open-document-selector-treeview.view {
   padding: 3px 6px 3px 6px;
@@ -603,9 +599,9 @@ MarlinViewWindow *:selected:focus {
 // Gala
 //
 .gala-notification {
-    border: 1px solid rgba(0, 0, 0, 0.35);
+    border: 1px solid if($variant=='light', rgba(0, 0, 0, 0.35), $borders_color);
     border-radius: 3px;
-	  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
     background-image: linear-gradient(to bottom, $base_color);
     background-color: transparent;
 
@@ -692,12 +688,11 @@ MarlinViewWindow *:selected:focus {
 PantheonTerminalPantheonTerminalWindow.background {
    background-color: transparent;
 
-
   .notebook {
 
     &.header.top {
-      box-shadow: inset 0  1px darken(opacify($header_bg, 1), 7%),
-                  inset 0 -1px lighten($borders_color, 5%);
+      box-shadow: inset 0  1px opacify($header_border, 1),
+                  inset 0 -1px if($variant == 'light', lighten($borders_color, 5%), lighten($borders_color, 1%));
     }
   }
 }