2 files changed, 37 insertions, 32 deletions

diff --git a/common/gtk-3.0/3.14/sass/_colors-public.scss b/common/gtk-3.0/3.14/sass/_colors-public.scss
index accfee4..4203b0c 100644
--- a/common/gtk-3.0/3.14/sass/_colors-public.scss
+++ b/common/gtk-3.0/3.14/sass/_colors-public.scss
@@ -16,7 +16,7 @@
 @define-color selected_bg_color #{"" + $selected_bg_color};
 @define-color selected_fg_color #{"" + $selected_fg_color};
 @define-color insensitive_bg_color #{"" + $insensitive_bg_color};
-@define-color insensitive_fg_color alpha(#{"" + opacify($insensitive_fg_color, 1)}, 0.5);
+@define-color insensitive_fg_color gtkalpha(#{"" + opacify($insensitive_fg_color, 1)}, 0.5);
 @define-color insensitive_base_color #{"" + $base_color};
 @define-color theme_unfocused_fg_color #{"" + $fg_color};
 @define-color theme_unfocused_text_color #{"" + $text_color};
@@ -34,14 +34,14 @@
 $wm_highlight: lighten(opacify($header_bg, 1), 3%);
 $wm_bg_unfocused: opacify($header_bg_backdrop, 1);
 
-@define-color wm_title alpha(#{"" + opacify($header_fg, 1)}, 0.8);
-@define-color wm_unfocused_title alpha(#{"" + opacify($header_fg, 1)}, 0.5);
+@define-color wm_title gtkalpha(#{"" + opacify($header_fg, 1)}, 0.8);
+@define-color wm_unfocused_title gtkalpha(#{"" + opacify($header_fg, 1)}, 0.5);
 
 @define-color wm_bg #{"" + opacify($header_bg, 1)};
 @define-color wm_bg_unfocused #{"" + $wm_bg_unfocused};
 
 @define-color wm_highlight #{"" + $wm_highlight};
-@define-color wm_shadow alpha(black, 0.35);
+@define-color wm_shadow gtkalpha(#{black}, 0.35);
 
 //WM Buttons
 
diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss
index 0700d58..aaafff7 100644
--- a/common/gtk-3.0/3.14/sass/_common.scss
+++ b/common/gtk-3.0/3.14/sass/_common.scss
@@ -1046,12 +1046,7 @@ GtkComboBox {
     border-color: $header_border;
   }
 
-  &:backdrop {
-    color: transparentize($header_fg, 0.3);
-    //background-color: opacify($header_bg_backdrop, 1);
-
-    .csd & { background-color: $header_bg_backdrop; }  // Transparent header-bars only in csd windows
-  }
+  &:backdrop { color: transparentize($header_fg, 0.3); }
 
   .title {
     padding: 0px 12px;
@@ -1134,21 +1129,18 @@ GtkComboBox {
   .maximized & {
     background-color: opacify($header_bg, 1);
     border-color: opacify($header_border, 1);
-
-    &:backdrop {
-      //background-color: opacify($header_bg_backdrop, 1);
-      border-color: opacify($header_border, 1);
-    }
   }
+
   &.default-decoration,
-  .csd &.default-decoration {
-    padding-top: 5px;	    // less padding for ssd
-    padding-bottom: 5px;    //
+  .csd &.default-decoration,             // needed under wayland, since all gtk3 windows are csd windows
+  &.default-decoration:backdrop,
+  .csd &.default-decoration:backdrop {
+    padding-top: 5px;	                   // less padding for ssd
+    padding-bottom: 5px;                 //
     background-color: opacify($header_bg, 1);
     border-bottom-width: 0;
 
-    //&:backdrop { background-color: opacify($header_bg_backdrop, 1); }
-    &:backdrop { background-color: opacify($header_bg, 1); }
+    .maximized & { background-color: opacify($header_bg, 1); }
   }
 }
 
@@ -1164,7 +1156,7 @@ GtkComboBox {
 
   &:backdrop {
     color: transparentize($header_fg, 0.3);
-    //background-color: opacify($header_bg_backdrop, 1);
+    background-color: opacify($header_bg_backdrop, 1);
 
     .csd & { background-color: $header_bg_backdrop; }
   }
@@ -1172,11 +1164,7 @@ GtkComboBox {
   .maximized & {
     background-color: opacify($header_bg, 1);
 
-    &:backdrop {
-    background-color: opacify($header_bg_backdrop, 1);
-
-    .csd & { background-color: opacify($header_bg_backdrop, 1); }
-    }
+    &:backdrop, .csd &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
   }
 }
 
@@ -1856,6 +1844,8 @@ column-header.button.dnd { // for treeview-like derive widgets
  * Scrollbars *
  **************/
 
+$_scrollbar_bg_color: darken($base_color, 1%);
+
 .scrollbar {
   background-clip: padding-box;
   background-image: none;
@@ -1863,7 +1853,7 @@ column-header.button.dnd { // for treeview-like derive widgets
   -GtkRange-trough-border: 0;
   -GtkScrollbar-has-backward-stepper: false;
   -GtkScrollbar-has-forward-stepper: false;
-  -GtkRange-slider-width: 11;
+  -GtkRange-slider-width: 13;
   -GtkScrollbar-min-slider-length: 42; // minimum size for the slider.
                                        // sadly can't be in '.slider'
                                        // where it belongs
@@ -1873,13 +1863,28 @@ column-header.button.dnd { // for treeview-like derive widgets
   .button {
     border: none;
   }
-  &.trough { @extend .scrollbars-junction; }
+  &.trough {
+    background-color: $_scrollbar_bg_color;
+    border-left: 1px solid $borders_color;
+
+    &.horizontal {
+      border-left: none;
+      border-top: 1px solid $borders_color;
+    }
+  }
   &.slider {
-    border-radius: 20px;
+    border-radius: 21px 20px 20px 21px;
     border: 3px solid transparent; //margin :/
-    background-color: mix($bg_color, $fg_color, 60%);
+    border-left-width: 4px;
+    background-color: mix($fg_color, $bg_color, 40%);
+
+    &.horizontal {
+      border-radius: 21px 21px 20px 20px;
+      border-left-width: 3px;
+      border-top-width: 4px;
+    }
     &:hover {
-      background-color: mix($bg_color, $fg_color, 30%);
+      background-color: mix($fg_color, $bg_color, 25%);
     }
     &:prelight:active {
       background-color: $selected_bg_color;
@@ -1899,7 +1904,7 @@ column-header.button.dnd { // for treeview-like derive widgets
 .scrollbars-junction,
 .scrollbars-junction.frame { // the small square between two scrollbars
   border-color: transparent;
-  background-color: $base_color;
+  background-color: $_scrollbar_bg_color;
 }