3.18: disable default-decoration transparency under wayland

7 files changed, 26 insertions, 13 deletions

diff --git a/common/gtk-3.0/3.18/gtk-contained-dark.css b/common/gtk-3.0/3.18/gtk-contained-dark.css
index 93ca64c..eac2e32 100644
--- a/common/gtk-3.0/3.18/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-dark.css
@@ -1081,12 +1081,14 @@ GtkComboBox {
     .maximized .header-bar:backdrop {
       background-color: #323843;
       border-color: #262a33; }
-  .header-bar.default-decoration {
+  .header-bar.default-decoration,
+  .csd .header-bar.default-decoration {
     padding-top: 5px;
     padding-bottom: 5px;
     background-color: #2f343f;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop {
+    .header-bar.default-decoration:backdrop,
+    .csd .header-bar.default-decoration:backdrop {
       background-color: #323843; }
 
 .titlebar {
diff --git a/common/gtk-3.0/3.18/gtk-contained-darker.css b/common/gtk-3.0/3.18/gtk-contained-darker.css
index 00cf083..4cffb6e 100644
--- a/common/gtk-3.0/3.18/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-darker.css
@@ -1084,12 +1084,14 @@ GtkComboBox {
     .maximized .header-bar:backdrop {
       background-color: #323843;
       border-color: #262a33; }
-  .header-bar.default-decoration {
+  .header-bar.default-decoration,
+  .csd .header-bar.default-decoration {
     padding-top: 5px;
     padding-bottom: 5px;
     background-color: #2f343f;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop {
+    .header-bar.default-decoration:backdrop,
+    .csd .header-bar.default-decoration:backdrop {
       background-color: #323843; }
 
 .titlebar {
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
index 0ca0fe4..b5c2865 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
@@ -1081,12 +1081,14 @@ GtkComboBox {
     .maximized .header-bar:backdrop {
       background-color: #323843;
       border-color: #262a33; }
-  .header-bar.default-decoration {
+  .header-bar.default-decoration,
+  .csd .header-bar.default-decoration {
     padding-top: 5px;
     padding-bottom: 5px;
     background-color: #2f343f;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop {
+    .header-bar.default-decoration:backdrop,
+    .csd .header-bar.default-decoration:backdrop {
       background-color: #323843; }
 
 .titlebar {
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
index 4896070..c8b996d 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
@@ -1084,12 +1084,14 @@ GtkComboBox {
     .maximized .header-bar:backdrop {
       background-color: #323843;
       border-color: #262a33; }
-  .header-bar.default-decoration {
+  .header-bar.default-decoration,
+  .csd .header-bar.default-decoration {
     padding-top: 5px;
     padding-bottom: 5px;
     background-color: #2f343f;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop {
+    .header-bar.default-decoration:backdrop,
+    .csd .header-bar.default-decoration:backdrop {
       background-color: #323843; }
 
 .titlebar {
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid.css b/common/gtk-3.0/3.18/gtk-contained-solid.css
index f664431..8fbe17b 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid.css
@@ -1084,12 +1084,14 @@ GtkComboBox {
     .maximized .header-bar:backdrop {
       background-color: #eff0f2;
       border-color: #d4d5db; }
-  .header-bar.default-decoration {
+  .header-bar.default-decoration,
+  .csd .header-bar.default-decoration {
     padding-top: 5px;
     padding-bottom: 5px;
     background-color: #e7e8eb;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop {
+    .header-bar.default-decoration:backdrop,
+    .csd .header-bar.default-decoration:backdrop {
       background-color: #eff0f2; }
 
 .titlebar {
diff --git a/common/gtk-3.0/3.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css
index fc51f9b..0757c7b 100644
--- a/common/gtk-3.0/3.18/gtk-contained.css
+++ b/common/gtk-3.0/3.18/gtk-contained.css
@@ -1084,12 +1084,14 @@ GtkComboBox {
     .maximized .header-bar:backdrop {
       background-color: #eff0f2;
       border-color: #d4d5db; }
-  .header-bar.default-decoration {
+  .header-bar.default-decoration,
+  .csd .header-bar.default-decoration {
     padding-top: 5px;
     padding-bottom: 5px;
     background-color: #e7e8eb;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop {
+    .header-bar.default-decoration:backdrop,
+    .csd .header-bar.default-decoration:backdrop {
       background-color: #eff0f2; }
 
 .titlebar {
diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index 06a890f..afe11a5 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -1183,7 +1183,8 @@ GtkComboBox {
     }
   }
 
-  &.default-decoration {
+  &.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;  //
     background-color: opacify($header_bg, 1);