handle separators in split titlebars correctly

7 files changed, 23 insertions, 15 deletions

diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 8a0bfdc..40984a8 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -1020,6 +1020,7 @@ headerbar:last-child, headerbar:last-child:backdrop {
   .tiled headerbar:last-child:backdrop {
     border-radius: 0; }
 
+window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop,
 window.csd > .titlebar:not(headerbar),
 window.csd > .titlebar:not(headerbar):backdrop {
   padding: 0;
@@ -1030,7 +1031,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
   box-shadow: none; }
 
 .titlebar:not(headerbar) > separator {
-  background: rgba(38, 42, 51, 0.97); }
+  background-image: linear-gradient(to top, rgba(38, 42, 51, 0.97)); }
 
 .primary-toolbar separator, headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton {
   min-width: 1px;
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index d9204ce..de35d40 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -1019,6 +1019,7 @@ headerbar:last-child, headerbar:last-child:backdrop {
   .tiled headerbar:last-child:backdrop {
     border-radius: 0; }
 
+window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop,
 window.csd > .titlebar:not(headerbar),
 window.csd > .titlebar:not(headerbar):backdrop {
   padding: 0;
@@ -1029,7 +1030,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
   box-shadow: none; }
 
 .titlebar:not(headerbar) > separator {
-  background: rgba(38, 42, 51, 0.97); }
+  background-image: linear-gradient(to top, rgba(38, 42, 51, 0.97)); }
 
 .primary-toolbar separator, headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton {
   min-width: 1px;
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index 478f37a..5c5945a 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -1020,6 +1020,7 @@ headerbar:last-child, headerbar:last-child:backdrop {
   .tiled headerbar:last-child:backdrop {
     border-radius: 0; }
 
+window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop,
 window.csd > .titlebar:not(headerbar),
 window.csd > .titlebar:not(headerbar):backdrop {
   padding: 0;
@@ -1030,7 +1031,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
   box-shadow: none; }
 
 .titlebar:not(headerbar) > separator {
-  background: #262a33; }
+  background-image: linear-gradient(to top, #262a33); }
 
 .primary-toolbar separator, headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton {
   min-width: 1px;
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index d7b3615..e8f0d1a 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -1019,6 +1019,7 @@ headerbar:last-child, headerbar:last-child:backdrop {
   .tiled headerbar:last-child:backdrop {
     border-radius: 0; }
 
+window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop,
 window.csd > .titlebar:not(headerbar),
 window.csd > .titlebar:not(headerbar):backdrop {
   padding: 0;
@@ -1029,7 +1030,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
   box-shadow: none; }
 
 .titlebar:not(headerbar) > separator {
-  background: #262a33; }
+  background-image: linear-gradient(to top, #262a33); }
 
 .primary-toolbar separator, headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton {
   min-width: 1px;
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index ea7a991..3afe4a4 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -1019,6 +1019,7 @@ headerbar:last-child, headerbar:last-child:backdrop {
   .tiled headerbar:last-child:backdrop {
     border-radius: 0; }
 
+window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop,
 window.csd > .titlebar:not(headerbar),
 window.csd > .titlebar:not(headerbar):backdrop {
   padding: 0;
@@ -1029,7 +1030,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
   box-shadow: none; }
 
 .titlebar:not(headerbar) > separator {
-  background: #d4d5db; }
+  background-image: linear-gradient(to top, #d4d5db); }
 
 .primary-toolbar separator, headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton {
   min-width: 1px;
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index b1ed084..ac370ad 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -1019,6 +1019,7 @@ headerbar:last-child, headerbar:last-child:backdrop {
   .tiled headerbar:last-child:backdrop {
     border-radius: 0; }
 
+window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop,
 window.csd > .titlebar:not(headerbar),
 window.csd > .titlebar:not(headerbar):backdrop {
   padding: 0;
@@ -1029,7 +1030,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
   box-shadow: none; }
 
 .titlebar:not(headerbar) > separator {
-  background: rgba(212, 213, 219, 0.95); }
+  background-image: linear-gradient(to top, rgba(212, 213, 219, 0.95)); }
 
 .primary-toolbar separator, headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton {
   min-width: 1px;
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index 5f23dd9..7a66400 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -1105,17 +1105,19 @@ headerbar {
 
 // Fixes split headerbars too
 .titlebar:not(headerbar) {
-  window.csd > &,
-  window.csd > &:backdrop {
-    padding: 0;
-    background-color: transparent;
-    background-image: none;
-    border-style: none;
-    border-color: transparent;
-    box-shadow: none;
+  window > &,
+  window.csd > & {
+    &, &:backdrop {
+      padding: 0;
+      background-color: transparent;
+      background-image: none;
+      border-style: none;
+      border-color: transparent;
+      box-shadow: none;
+    }
   }
 
-  > separator { background: $header_border; }
+  > separator { background-image: linear-gradient(to top, $header_border); }
 
   @extend %titlebar;
 }