1 files changed, 32 insertions, 46 deletions

diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index ccd5cb8..0b3f174 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -940,26 +940,30 @@ actionbar {
 //
 // Headerbars
 //
-headerbar {
+$_header_radius: if($darker=='false' and $variant=='light', 4px, 3px);
+
+headerbar,
+%titlebar {
+
   min-height: 42px;
-  padding: 0 5px;
+  padding: 0 7px;
 
   border-width: 0 0 1px;
   border-style: solid;
-  border-radius: 0;
   border-color: opacify($header_border, 1);
 
   color: $header_fg;
   background-color: opacify($header_bg, 1);
+  box-shadow: inset 0  1px lighten($header_bg, 3%);
 
   .csd & {  // Transparent header-bars only in csd windows
-    border-radius: if($darker=='false' and $variant=='light', 4px 4px 0 0, 3px 3px 0 0);
     background-color: $header_bg;
     border-color: $header_border;
   }
 
   &:backdrop {
     color: transparentize($header_fg, 0.3);
+    background-color: opacify($header_bg_backdrop, 1);
 
     .csd & { background-color: $header_bg_backdrop; }
   }
@@ -1047,6 +1051,8 @@ headerbar {
   .maximized & {
     background-color: opacify($header_bg, 1);
     border-color: opacify($header_border, 1);
+
+    &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
   }
 
   &.default-decoration,
@@ -1063,55 +1069,35 @@ headerbar {
 }
 
 .titlebar {
-  padding: 0 7px;
-  border-radius: if($darker=='false' and $variant=='light', 4px 4px 0 0, 3px 3px 0 0);
-  color: $header_fg;
-  background-color: opacify($header_bg, 1);
-  box-shadow: inset 0  1px lighten($header_bg, 3%);
-
-  .csd & { background-color: $header_bg; }
-
-  &:backdrop {
-    color: transparentize($header_fg, 0.3);
-    background-color: opacify($header_bg_backdrop, 1);
-
-    .csd & { background-color: $header_bg_backdrop; }
-  }
-
-  .maximized & {
-    background-color: opacify($header_bg, 1);
+  border-radius: $_header_radius $_header_radius 0 0;
+}
 
-    &:backdrop, .csd &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
-  }
+headerbar {
+  separator:first-child + &,
+  &:first-child { &, &:backdrop { border-top-left-radius: $_header_radius; }}
 
-  // Fixes double backgrounds on paned headerbars
-  &:not(headerbar),
-  &:backdrop:not(headerbar) {
-    window > &,
-    window.csd > & {
-      padding: 0;
-      border: none;
-      background: none;
-    }
-  }
-  // Separator in Gnome Tweak Tool
-  separator { background-color: $header_border; }
+  &:last-child { &, &:backdrop { border-top-right-radius: $_header_radius; }}
 }
 
-// more paned headerbar fixes (Gedit)
-paned.titlebar {
-  separator { background-color: transparent; }
+.titlebar:not(headerbar) {
+  window.csd > &,
+  window.csd > &:backdrop {
+    // in csd we assume every titlebar is a headerbar so reset anything, this is needed for split toolbars cases
+    padding: 0;
+    background-color: transparent;
+    background-image: none;
+    border-style: none;
+    border-color: transparent;
+    box-shadow: none;
+  }
 
-  > headerbar {
-    &:not(:only-child):not(:first-child):not(:last-child) { border-radius: 0;}
+  > separator { background: $header_border; }
 
-    ~ headerbar { border-top-left-radius: 0; }
-    &:first-child { border-top-right-radius: 0; }
-  }
+  @extend %titlebar;
 }
 
-// Only extending headerbar avoids some problems (Gnome Documents searchbar)
-headerbar {
+headerbar,
+%titlebar {
   separator.titlebutton { @extend %header_separator; }
 
   @extend %header_widgets;
@@ -2308,7 +2294,7 @@ levelbar {
 printdialog {
   paper {
     border: 1px solid $borders_color;
-    background: white;
+    background: $base_color;
     padding: 0;
   }