2 files changed, 13 insertions, 25 deletions
diff --git a/common/gtk-3.0/3.18/sass/_colors-public.scss b/common/gtk-3.0/3.18/sass/_colors-public.scss
index accfee4..4203b0c 100644
--- a/common/gtk-3.0/3.18/sass/_colors-public.scss
+++ b/common/gtk-3.0/3.18/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.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index 4b5f6d9..f1ff41f 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -1088,12 +1088,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;
@@ -1176,21 +1171,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 {  // needed under wayland, since all gtk3 windows are csd windows
-    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); }
+    .maximized & { background-color: opacify($header_bg, 1); }
   }
 }
 
@@ -1206,7 +1198,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; }
   }
@@ -1214,11 +1206,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); }
   }
 }