all themes: adjustments for headerbars

- border-radius fixes for double headerbars
- separator fixes
- height fixes
- dropping old workarounds

8 files changed, 129 insertions, 101 deletions

diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
index b90a7d06..7f90f67f 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
@@ -3038,6 +3038,29 @@ headerbar,
     border-width: 0px;
 }
 
+.horizontal.titlebar headerbar:first-child,
+paned.horizontal.titlebar headerbar:first-child {
+	border-top-right-radius: 0px;
+}
+
+.horizontal.titlebar headerbar:last-child,
+paned.horizontal.titlebar headerbar:last-child {
+	border-top-left-radius: 0px;
+}
+
+paned.horizontal.titlebar separator,
+.horizontal.titlebar separator.vertical.tilix-title-separator {
+	background-color: transparent;
+	background-image: none;
+	color: transparent;
+}
+
+paned.horizontal.titlebar separator:backdrop,
+.horizontal.titlebar separator.vertical.tilix-title-separator:backdrop {
+    min-width: 5px;
+    background-color: darker (@theme_bg_color);
+}
+
 .background.csd > paned.horizontal.titlebar > headerbar,
 .background.ssd > paned.horizontal.titlebar > headerbar,
 .background.solid-csd > paned.horizontal.titlebar > headerbar {
diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
index 50fe7c4c..ae343092 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
@@ -5957,6 +5957,7 @@ entry.cursor-handle.bottom,
  ***************/

 

 headerbar,

+.horizontal.titlebar,  /* eg. tilix */

 .background.ssd > paned.horizontal.titlebar,

 .background.csd > paned.horizontal.titlebar,

 .background.solid-csd > paned.horizontal.titlebar {

@@ -5967,6 +5968,8 @@ headerbar,
     box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95);

 }

 

+headerbar,

+.titlebar,

 headerbar.titlebar,

 .background.ssd > paned.horizontal.titlebar,

 .background.csd > paned.horizontal.titlebar,

@@ -5975,24 +5978,23 @@ headerbar.titlebar,
     border-style: solid;

     border-color: shade(@borders_headerbar, 0.90);

     border-radius: 7px 7px 0px 0px;

-    padding: 6px 6px 5px 6px;

+    padding: 2px 6px;

 }

 

-/* fix for gedit, .titlebar does not match headerbar selector */

-.background.ssd > paned.horizontal.titlebar > headerbar,

-.background.csd > paned.horizontal.titlebar > headerbar,

-.background.solid-csd > paned.horizontal.titlebar > headerbar {

-    box-shadow: none;

+.horizontal.titlebar headerbar:first-child,

+paned.horizontal.titlebar headerbar:first-child {

+	border-top-right-radius: 0px;

 }

 

-/* fix for ie. gthumb */

-.titlebar > headerbar {

-    border-radius: 7px 7px 0 0;

+.horizontal.titlebar headerbar:last-child,

+paned.horizontal.titlebar headerbar:last-child {

+	border-top-left-radius: 0px;

 }

 

 .background.ssd > paned.horizontal.titlebar > separator, /* gedit */

 .background.csd > paned.horizontal.titlebar > separator,

-.background.solid-csd > paned.horizontal.titlebar > separator {

+.background.solid-csd > paned.horizontal.titlebar > separator,

+.horizontal.titlebar separator.vertical.tilix-title-separator {  /* tilix */

     min-width: 1px;

     background-color: shade(@menu_fg_dark_color, 0.3);

     border-image: -gtk-gradient (linear,

@@ -6004,13 +6006,6 @@ headerbar.titlebar,
     border-style: solid;

 }

 

-/* ie. meld */

-dialog.background.csd > headerbar.titlebar,

-dialog.background.ssd > headerbar.titlebar,

-dialog.background.solid-csd > headerbar.titlebar  {

-	padding:  4px 6px 5px 6px;

-}

-

 headerbar.titlebar:backdrop {

     border-image: linear-gradient(to top,

                                   @unfocused_borders_headerbar,

diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
index 62c921c2..129243c4 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
@@ -5427,23 +5427,7 @@ headerbar,
 	border-style: solid;
     box-shadow: inset 0 -1px alpha(@theme_base_color, 0.4);
     border-color: @borders;
-	padding: 6px;
-}
-
-/* fix for gedit, .titlebar does not match headerbar selector */
-.background.csd > paned.horizontal.titlebar,
-.background.solid-csd > paned.horizontal.titlebar {
-    background-color: transparent;
-    padding: 0px 0px 0px 0px;
-    margin: 0px -2px 0px -2px;
-    border-width: 0px;
-}
-
-/* ie. meld */
-dialog.background.csd > headerbar.titlebar,
-dialog.background.ssd > headerbar.titlebar,
-dialog.background.solid-csd > headerbar.titlebar  {
-	padding:  4px 6px 5px 6px;
+    padding: 3px 6px;
 }
 
 .tiled .titlebar {
@@ -5475,6 +5459,21 @@ headerbar .subtitle {
 	padding: 0px 12px;
 }
 
+.horizontal.titlebar headerbar:first-child,
+paned.horizontal.titlebar headerbar:first-child {
+	border-top-right-radius: 0px;
+}
+
+.horizontal.titlebar headerbar:last-child,
+paned.horizontal.titlebar headerbar:last-child {
+	border-top-left-radius: 0px;
+}
+
+paned.horizontal.titlebar > separator,
+.horizontal.titlebar > separator.vertical.tilix-title-separator {
+	background-color: transparent;
+}
+
 /*
 .titlebar:backdrop {
     color: @theme_unfocused_fg_color;
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
index c3785c36..b548c915 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
@@ -5956,6 +5956,7 @@ entry.cursor-handle.bottom,
  ***************/

 

 headerbar,

+.horizontal.titlebar,  /* eg. tilix */

 .background.ssd > paned.horizontal.titlebar,

 .background.csd > paned.horizontal.titlebar,

 .background.solid-csd > paned.horizontal.titlebar {

@@ -5966,6 +5967,8 @@ headerbar,
     box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95);

 }

 

+headerbar,

+.titlebar,

 headerbar.titlebar,

 .background.ssd > paned.horizontal.titlebar,

 .background.csd > paned.horizontal.titlebar,

@@ -5974,24 +5977,23 @@ headerbar.titlebar,
     border-style: solid;

     border-color: shade(@borders_headerbar, 0.90);

     border-radius: 7px 7px 0px 0px;

-    padding: 6px 6px 5px 6px;

+    padding: 2px 6px;

 }

 

-/* fix for gedit, .titlebar does not match headerbar selector */

-.background.ssd > paned.horizontal.titlebar > headerbar,

-.background.csd > paned.horizontal.titlebar > headerbar,

-.background.solid-csd > paned.horizontal.titlebar > headerbar {

-    box-shadow: none;

+.horizontal.titlebar headerbar:first-child,

+paned.horizontal.titlebar headerbar:first-child {

+	border-top-right-radius: 0px;

 }

 

-/* fix for ie. gthumb */

-.titlebar > headerbar {

-    border-radius: 7px 7px 0 0;

+.horizontal.titlebar headerbar:last-child,

+paned.horizontal.titlebar headerbar:last-child {

+	border-top-left-radius: 0px;

 }

 

 .background.ssd > paned.horizontal.titlebar > separator, /* gedit */

 .background.csd > paned.horizontal.titlebar > separator,

-.background.solid-csd > paned.horizontal.titlebar > separator {

+.background.solid-csd > paned.horizontal.titlebar > separator,

+.horizontal.titlebar separator.vertical.tilix-title-separator {  /* tilix */

     min-width: 1px;

     background-color: shade(@menu_fg_dark_color, 0.3);

     border-image: -gtk-gradient (linear,

@@ -6003,13 +6005,6 @@ headerbar.titlebar,
     border-style: solid;

 }

 

-/* ie. meld */

-dialog.background.csd > headerbar.titlebar,

-dialog.background.ssd > headerbar.titlebar,

-dialog.background.solid-csd > headerbar.titlebar  {

-	padding:  4px 6px 5px 6px;

-}

-

 headerbar.titlebar:backdrop {

 

     border-image: linear-gradient(to top,

diff --git a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
index f60301a5..3b1752b0 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
@@ -3418,28 +3418,12 @@ headerbar,
                                       shade (@theme_bg_color, 1.20),
                                       shade (@theme_bg_color, 1.0));
     border-radius: 7px 7px 0 0;
-    padding: 5px;
+    padding: 3px 5px;
     border-width: 0 0 1px;
     border-style: solid;
     border-color: shade(@theme_bg_color, 0.8);
 }
 
-/* fix for gedit, .titlebar does not match headerbar selector */
-.background.csd > paned.horizontal.titlebar,
-.background.solid-csd > paned.horizontal.titlebar {
-    background-color: transparent;
-    padding: 0px 0px 0px 0px;
-    margin: 0px -2px 0px -2px;
-    border-width: 0px;
-}
-
-/* ie. meld */
-dialog.background.csd > headerbar.titlebar,
-dialog.background.ssd > headerbar.titlebar,
-dialog.background.solid-csd > headerbar.titlebar  {
-    padding: 1px 5px;
-}
-
 .tiled .titlebar {
     border-radius: 0;
 }
@@ -3448,6 +3432,23 @@ dialog.background.solid-csd > headerbar.titlebar  {
     border-radius: 0;
 }
 
+.horizontal.titlebar headerbar:first-child,
+paned.horizontal.titlebar headerbar:first-child {
+	border-top-right-radius: 0px;
+}
+
+.horizontal.titlebar headerbar:last-child,
+paned.horizontal.titlebar headerbar:last-child {
+	border-top-left-radius: 0px;
+}
+
+paned.horizontal.titlebar separator,
+.horizontal.titlebar separator.vertical.tilix-title-separator {
+	background-color: transparent;
+	background-image: none;
+	color: transparent;
+}
+
 /* this is the default titlebar that is added by GTK
  * when client-side decorations are in use and the application
  * did not set a custom titlebar.
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
index 06a5b41b..431f6093 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -5427,23 +5427,7 @@ headerbar,
 	border-style: solid;
     box-shadow: inset 0 -1px alpha(@theme_base_color, 0.4);
     border-color: @borders;
-	padding: 6px;
-}
-
-/* fix for gedit, .titlebar does not match headerbar selector */
-.background.csd > paned.horizontal.titlebar,
-.background.solid-csd > paned.horizontal.titlebar {
-    background-color: transparent;
-    padding: 0px 0px 0px 0px;
-    margin: 0px -2px 0px -2px;
-    border-width: 0px;
-}
-
-/* ie. meld */
-dialog.background.csd > headerbar.titlebar,
-dialog.background.ssd > headerbar.titlebar,
-dialog.background.solid-csd > headerbar.titlebar  {
-	padding:  4px 6px 5px 6px;
+    padding: 3px 6px;
 }
 
 .tiled .titlebar {
@@ -5475,6 +5459,21 @@ headerbar .subtitle {
 	padding: 0px 12px;
 }
 
+.horizontal.titlebar headerbar:first-child,
+paned.horizontal.titlebar headerbar:first-child {
+	border-top-right-radius: 0px;
+}
+
+.horizontal.titlebar headerbar:last-child,
+paned.horizontal.titlebar headerbar:last-child {
+	border-top-left-radius: 0px;
+}
+
+paned.horizontal.titlebar > separator,
+.horizontal.titlebar > separator.vertical.tilix-title-separator {
+	background-color: transparent;
+}
+
 /*
 .titlebar:backdrop {
     color: @theme_unfocused_fg_color;
diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
index 1a2dd797..07c704ff 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
@@ -3895,16 +3895,24 @@ headerbar,
     border-radius: 7px 7px 0 0;
     border-bottom: 1px solid;
     border-color: shade(@border_color, 1.30);
-    padding: 5px 4px 4px 4px;
+    padding: 3px 4px;
 }
 
-/* fix for gedit, .titlebar does not match headerbar selector */
-.background.csd > paned.horizontal.titlebar,
-.background.solid-csd > paned.horizontal.titlebar {
-    background-color: transparent;
-    padding: 0px;
-    margin: -2px 0px -2px 0px;
-    border-width: 0px;
+.horizontal.titlebar headerbar:first-child,
+paned.horizontal.titlebar headerbar:first-child {
+	border-top-right-radius: 0px;
+}
+
+.horizontal.titlebar headerbar:last-child,
+paned.horizontal.titlebar headerbar:last-child {
+	border-top-left-radius: 0px;
+}
+
+paned.horizontal.titlebar separator,
+.horizontal.titlebar separator.vertical.tilix-title-separator {
+	background-color: transparent;
+	background-image: none;
+	color: transparent;
 }
 
 .tiled .titlebar {
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
index 54d552d6..ab03b7df 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
@@ -3897,16 +3897,24 @@ headerbar,
     border-radius: 7px 7px 0 0;
     border-bottom: 1px solid;
     border-color: shade(@border_color, 1.30);
-    padding: 5px 4px 4px 4px;
+    padding: 3px 4px;
 }
 
-/* fix for gedit, .titlebar does not match headerbar selector */
-.background.csd > paned.horizontal.titlebar,
-.background.solid-csd > paned.horizontal.titlebar {
-    background-color: transparent;
-    padding: 0px;
-    margin: -2px 0px -2px 0px;
-    border-width: 0px;
+.horizontal.titlebar headerbar:first-child,
+paned.horizontal.titlebar headerbar:first-child {
+	border-top-right-radius: 0px;
+}
+
+.horizontal.titlebar headerbar:last-child,
+paned.horizontal.titlebar headerbar:last-child {
+	border-top-left-radius: 0px;
+}
+
+paned.horizontal.titlebar separator,
+.horizontal.titlebar separator.vertical.tilix-title-separator {
+	background-color: transparent;
+	background-image: none;
+	color: transparent;
 }
 
 .tiled .titlebar {