1 files changed, 20 insertions, 20 deletions

diff --git a/common/gtk-3.0/3.16/_common.scss b/common/gtk-3.0/3.16/_common.scss
index 7ca39c0..771530c 100644
--- a/common/gtk-3.0/3.16/_common.scss
+++ b/common/gtk-3.0/3.16/_common.scss
@@ -985,7 +985,7 @@ GtkComboBox {
   border-image: linear-gradient(to bottom, opacify($header_bg, 1),
                                            darken($header_bg, 7%)) 1 0 1 0; //temporary hack for rhythmbox 3.1
 
-  &:backdrop { background-color: lighten(opacify($header_bg, 1), 3%); }
+  &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
 
   .separator { @extend %header_separator; }
 
@@ -1023,7 +1023,7 @@ GtkComboBox {
   border-width: 0 0 1px;
   border-style: solid;
   border-radius: 0;
-  border-color: darken($header_bg, 7%);
+  border-color: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%));
 
   color: $header_fg;
   background-color: opacify($header_bg, 1);
@@ -1032,9 +1032,9 @@ GtkComboBox {
 
   &:backdrop {
     color: transparentize($header_fg, 0.3);
-    background-color: lighten(opacify($header_bg, 1), 3%);
+    background-color: opacify($header_bg_backdrop, 1);
 
-    .csd & { background-color: lighten($header_bg, 3%); }  // Transparent header-bars only in csd windows
+    .csd & { background-color: $header_bg_backdrop; }  // Transparent header-bars only in csd windows
   }
 
   .title {
@@ -1117,7 +1117,7 @@ GtkComboBox {
   .maximized & {
     background-color: opacify($header_bg, 1);
 
-    &:backdrop { background-color: opacify(lighten($header_bg, 3%), 1); }
+    &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
   }
 
   &.default-decoration {
@@ -1126,7 +1126,7 @@ GtkComboBox {
     background-color: opacify($header_bg, 1);
     border-bottom-width: 0;
 
-    &:backdrop { background-color: lighten(opacify($header_bg, 1), 3%); }
+    &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
   }
 }
 
@@ -1142,15 +1142,15 @@ GtkComboBox {
 
   &:backdrop {
     color: transparentize($header_fg, 0.3);
-    background-color: opacify($header_bg, 1);
+    background-color: opacify($header_bg_backdrop, 1);
 
-    .csd & { background-color: lighten($header_bg, 3%); }
+    .csd & { background-color: $header_bg_backdrop; }
   }
 
   .maximized & {
     background-color: opacify($header_bg, 1);
 
-    &:backdrop { background-color: opacify(lighten($header_bg, 3%), 1); }
+    &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
   }
 }
 
@@ -1486,7 +1486,7 @@ column-header.button.dnd { // for treeview-like derive widgets
   background-color: opacify($header_bg, 1);
   color: $header_fg;
 
-  &:backdrop { background-color: lighten(opacify($header_bg, 1), 3%); }
+  &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
 
   & > .menuitem {
     padding: 6px 8px;
@@ -1508,7 +1508,7 @@ column-header.button.dnd { // for treeview-like derive widgets
   margin: 4px;
   padding: 0;
   border-radius: 0;
-  background-color: $base_color;
+  background-color: if($variant == 'light', $base_color, darken($base_color, 3%));
   border: 1px solid $borders_color;
 
   .csd & {
@@ -1521,8 +1521,8 @@ column-header.button.dnd { // for treeview-like derive widgets
     padding: 5px;
     &:hover {
       color: $fg_color;
-      background-color: transparentize(black, 0.96);
-      border: solid transparentize(black, 0.92);
+      background-color: if($variant == 'light', transparentize(black, 0.96), transparentize(white, 0.95));
+      border: solid if($variant == 'light', transparentize(black, 0.92), transparentize(white, 0.93));
       border-width: 1px 0 1px 0;
     }
     &:insensitive {
@@ -1561,7 +1561,7 @@ column-header.button.dnd { // for treeview-like derive widgets
   border: 1px solid darken($borders_color, 5%);
   border-radius: 3px;
   background-clip: border-box;
-  background-color: $base_color;
+  background-color: if($variant == 'light', $base_color, darken($base_color, 3%));
 
   box-shadow: 0 2px 6px 1px transparentize(black, 0.93);
 
@@ -1633,7 +1633,7 @@ column-header.button.dnd { // for treeview-like derive widgets
       &.left { border-right-width: 0; }
     }
 
-    $_header_border: lighten($borders_color, 5%);
+    $_header_border: if($variant == 'light', lighten($borders_color, 5%), lighten($borders_color, 1%));
     &.top {
       box-shadow: inset 0 -1px $_header_border; // border
     }
@@ -1693,8 +1693,8 @@ column-header.button.dnd { // for treeview-like derive widgets
           border-width: 1px;
           border-#{$_tab}-width: 0;
           border-color: $borders_color;
-          background-color: transparentize(black, 0.98);
-          &:hover { background-color: transparentize(black, 0.98); }
+          background-color: if($variant == 'light', transparentize(black, 0.98), transparentize(black, 0.9));
+          &:hover { background-color: if($variant == 'light', transparentize(black, 0.98), transparentize(black, 0.9)); }
         }
       }
     }
@@ -1769,7 +1769,7 @@ $_scrollbar_bg_color: darken($base_color, 1%);
       .slider {
         margin: 0;
         background-color: mix($fg_color, $bg_color, 70%);
-        border: 1px solid transparentize(white, 0.4);
+        border: 1px solid if($variant == 'light', transparentize(white, 0.4), transparentize(black, 0.7));
         background-clip: padding-box;
       }
 
@@ -2651,8 +2651,8 @@ GtkVolumeButton.button { padding: 8px; }
 
   // this needs to be transparent
   // see bug #722563
-  $_wm_border: transparentize(black, 0.9);
-  $_wm_border_backdrop: transparentize(black, 0.9);
+  $_wm_border: if($variant=='light', transparentize(black, 0.9), transparentize(black, 0.35));
+  $_wm_border_backdrop: if($variant=='light', transparentize(black, 0.9), transparentize(black, 0.35));
 
   box-shadow: 0 0 0 1px $_wm_border, 0 4px 8px 1px $_wm_border;