From a3783b285f1a03c13b6f5b2d7adae1b4343fead1 Mon Sep 17 00:00:00 2001
From: Horst3180 <horst3180@gmx.net>
Date: Fri, 19 Feb 2016 11:06:17 +0100
Subject: [PATCH] paned headerbar fixes

---
 common/gtk-3.0/3.20/gtk-dark.css         | 21 +++++++++++++++++----
 common/gtk-3.0/3.20/gtk-darker.css       | 21 +++++++++++++++++----
 common/gtk-3.0/3.20/gtk-solid-dark.css   | 21 +++++++++++++++++----
 common/gtk-3.0/3.20/gtk-solid-darker.css | 21 +++++++++++++++++----
 common/gtk-3.0/3.20/gtk-solid.css        | 21 +++++++++++++++++----
 common/gtk-3.0/3.20/gtk.css              | 21 +++++++++++++++++----
 common/gtk-3.0/3.20/sass/_common.scss    | 24 +++++++++++++++++++-----
 7 files changed, 121 insertions(+), 29 deletions(-)

diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 70f826b..70bb6fb 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -815,10 +815,13 @@ headerbar {
   color: rgba(207, 218, 231, 0.8);
   background-color: #2f343f; }
   .csd headerbar {
+    border-radius: 3px 3px 0 0;
     background-color: rgba(47, 52, 63, 0.97);
     border-color: rgba(38, 42, 51, 0.97); }
   headerbar:backdrop {
     color: rgba(207, 218, 231, 0.5); }
+    .csd headerbar:backdrop {
+      background-color: rgba(50, 56, 67, 0.97); }
   headerbar .title {
     padding-left: 12px;
     padding-right: 12px; }
@@ -909,13 +912,26 @@ headerbar {
     .maximized .titlebar:backdrop, .csd .maximized .titlebar:backdrop {
       background-color: #323843; }
   window > .titlebar:not(headerbar),
-  window.csd > .titlebar:not(headerbar) {
+  window.csd > .titlebar:not(headerbar), window > .titlebar:backdrop:not(headerbar),
+  window.csd > .titlebar:backdrop:not(headerbar) {
     padding: 0;
     border: none;
     background: none; }
   .titlebar separator, .titlebar .sidebar .view separator, .sidebar .view .titlebar separator {
     background-color: rgba(38, 42, 51, 0.97); }
 
+paned.titlebar separator, paned.titlebar .sidebar .view separator, .sidebar .view paned.titlebar separator {
+  background-color: transparent; }
+
+paned.titlebar > headerbar::not(:only-child):not(:first-child):not(:last-child) {
+  border-radius: 0; }
+
+paned.titlebar > headerbar:first-child {
+  border-top-right-radius: 0; }
+
+paned.titlebar > headerbar:last-child {
+  border-top-left-radius: 0; }
+
 headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
   margin-top: 6px;
   margin-bottom: 6px; }
@@ -2331,9 +2347,6 @@ placesview .server-list-button:checked > image {
   transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   -gtk-icon-transform: rotate(-0.5turn); }
 
-placesview row.activatable:hover {
-  background-color: transparent; }
-
 paned > separator, .sidebar paned > separator, .sidebar .view paned > separator {
   min-width: 1px;
   min-height: 1px;
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index a3a9520..848cad8 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -814,10 +814,13 @@ headerbar {
   color: rgba(207, 218, 231, 0.8);
   background-color: #2f343f; }
   .csd headerbar {
+    border-radius: 3px 3px 0 0;
     background-color: rgba(47, 52, 63, 0.97);
     border-color: rgba(38, 42, 51, 0.97); }
   headerbar:backdrop {
     color: rgba(207, 218, 231, 0.5); }
+    .csd headerbar:backdrop {
+      background-color: rgba(50, 56, 67, 0.97); }
   headerbar .title {
     padding-left: 12px;
     padding-right: 12px; }
@@ -908,13 +911,26 @@ headerbar {
     .maximized .titlebar:backdrop, .csd .maximized .titlebar:backdrop {
       background-color: #323843; }
   window > .titlebar:not(headerbar),
-  window.csd > .titlebar:not(headerbar) {
+  window.csd > .titlebar:not(headerbar), window > .titlebar:backdrop:not(headerbar),
+  window.csd > .titlebar:backdrop:not(headerbar) {
     padding: 0;
     border: none;
     background: none; }
   .titlebar separator, .titlebar .sidebar .view separator, .sidebar .view .titlebar separator {
     background-color: rgba(38, 42, 51, 0.97); }
 
+paned.titlebar separator, paned.titlebar .sidebar .view separator, .sidebar .view paned.titlebar separator {
+  background-color: transparent; }
+
+paned.titlebar > headerbar::not(:only-child):not(:first-child):not(:last-child) {
+  border-radius: 0; }
+
+paned.titlebar > headerbar:first-child {
+  border-top-right-radius: 0; }
+
+paned.titlebar > headerbar:last-child {
+  border-top-left-radius: 0; }
+
 headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
   margin-top: 6px;
   margin-bottom: 6px; }
@@ -2330,9 +2346,6 @@ placesview .server-list-button:checked > image {
   transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   -gtk-icon-transform: rotate(-0.5turn); }
 
-placesview row.activatable:hover {
-  background-color: transparent; }
-
 paned > separator, .sidebar paned > separator, .sidebar .view paned > separator {
   min-width: 1px;
   min-height: 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 9feac77..e4160a9 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -815,10 +815,13 @@ headerbar {
   color: rgba(207, 218, 231, 0.8);
   background-color: #2f343f; }
   .csd headerbar {
+    border-radius: 3px 3px 0 0;
     background-color: #2f343f;
     border-color: #262a33; }
   headerbar:backdrop {
     color: rgba(207, 218, 231, 0.5); }
+    .csd headerbar:backdrop {
+      background-color: #323843; }
   headerbar .title {
     padding-left: 12px;
     padding-right: 12px; }
@@ -909,13 +912,26 @@ headerbar {
     .maximized .titlebar:backdrop, .csd .maximized .titlebar:backdrop {
       background-color: #323843; }
   window > .titlebar:not(headerbar),
-  window.csd > .titlebar:not(headerbar) {
+  window.csd > .titlebar:not(headerbar), window > .titlebar:backdrop:not(headerbar),
+  window.csd > .titlebar:backdrop:not(headerbar) {
     padding: 0;
     border: none;
     background: none; }
   .titlebar separator, .titlebar .sidebar .view separator, .sidebar .view .titlebar separator {
     background-color: #262a33; }
 
+paned.titlebar separator, paned.titlebar .sidebar .view separator, .sidebar .view paned.titlebar separator {
+  background-color: transparent; }
+
+paned.titlebar > headerbar::not(:only-child):not(:first-child):not(:last-child) {
+  border-radius: 0; }
+
+paned.titlebar > headerbar:first-child {
+  border-top-right-radius: 0; }
+
+paned.titlebar > headerbar:last-child {
+  border-top-left-radius: 0; }
+
 headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
   margin-top: 6px;
   margin-bottom: 6px; }
@@ -2331,9 +2347,6 @@ placesview .server-list-button:checked > image {
   transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   -gtk-icon-transform: rotate(-0.5turn); }
 
-placesview row.activatable:hover {
-  background-color: transparent; }
-
 paned > separator, .sidebar paned > separator, .sidebar .view paned > separator {
   min-width: 1px;
   min-height: 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 eba9392..1704319 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -814,10 +814,13 @@ headerbar {
   color: rgba(207, 218, 231, 0.8);
   background-color: #2f343f; }
   .csd headerbar {
+    border-radius: 3px 3px 0 0;
     background-color: #2f343f;
     border-color: #262a33; }
   headerbar:backdrop {
     color: rgba(207, 218, 231, 0.5); }
+    .csd headerbar:backdrop {
+      background-color: #323843; }
   headerbar .title {
     padding-left: 12px;
     padding-right: 12px; }
@@ -908,13 +911,26 @@ headerbar {
     .maximized .titlebar:backdrop, .csd .maximized .titlebar:backdrop {
       background-color: #323843; }
   window > .titlebar:not(headerbar),
-  window.csd > .titlebar:not(headerbar) {
+  window.csd > .titlebar:not(headerbar), window > .titlebar:backdrop:not(headerbar),
+  window.csd > .titlebar:backdrop:not(headerbar) {
     padding: 0;
     border: none;
     background: none; }
   .titlebar separator, .titlebar .sidebar .view separator, .sidebar .view .titlebar separator {
     background-color: #262a33; }
 
+paned.titlebar separator, paned.titlebar .sidebar .view separator, .sidebar .view paned.titlebar separator {
+  background-color: transparent; }
+
+paned.titlebar > headerbar::not(:only-child):not(:first-child):not(:last-child) {
+  border-radius: 0; }
+
+paned.titlebar > headerbar:first-child {
+  border-top-right-radius: 0; }
+
+paned.titlebar > headerbar:last-child {
+  border-top-left-radius: 0; }
+
 headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
   margin-top: 6px;
   margin-bottom: 6px; }
@@ -2330,9 +2346,6 @@ placesview .server-list-button:checked > image {
   transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   -gtk-icon-transform: rotate(-0.5turn); }
 
-placesview row.activatable:hover {
-  background-color: transparent; }
-
 paned > separator, .sidebar paned > separator, .sidebar .view paned > separator {
   min-width: 1px;
   min-height: 1px;
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index 1ee4059..7a31c08 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -814,10 +814,13 @@ headerbar {
   color: rgba(82, 93, 118, 0.8);
   background-color: #e7e8eb; }
   .csd headerbar {
+    border-radius: 4px 4px 0 0;
     background-color: #e7e8eb;
     border-color: #d4d5db; }
   headerbar:backdrop {
     color: rgba(82, 93, 118, 0.5); }
+    .csd headerbar:backdrop {
+      background-color: #eff0f2; }
   headerbar .title {
     padding-left: 12px;
     padding-right: 12px; }
@@ -908,13 +911,26 @@ headerbar {
     .maximized .titlebar:backdrop, .csd .maximized .titlebar:backdrop {
       background-color: #eff0f2; }
   window > .titlebar:not(headerbar),
-  window.csd > .titlebar:not(headerbar) {
+  window.csd > .titlebar:not(headerbar), window > .titlebar:backdrop:not(headerbar),
+  window.csd > .titlebar:backdrop:not(headerbar) {
     padding: 0;
     border: none;
     background: none; }
   .titlebar separator, .titlebar .sidebar .view separator, .sidebar .view .titlebar separator {
     background-color: #d4d5db; }
 
+paned.titlebar separator, paned.titlebar .sidebar .view separator, .sidebar .view paned.titlebar separator {
+  background-color: transparent; }
+
+paned.titlebar > headerbar::not(:only-child):not(:first-child):not(:last-child) {
+  border-radius: 0; }
+
+paned.titlebar > headerbar:first-child {
+  border-top-right-radius: 0; }
+
+paned.titlebar > headerbar:last-child {
+  border-top-left-radius: 0; }
+
 headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
   margin-top: 6px;
   margin-bottom: 6px; }
@@ -2334,9 +2350,6 @@ placesview .server-list-button:checked > image {
   transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   -gtk-icon-transform: rotate(-0.5turn); }
 
-placesview row.activatable:hover {
-  background-color: transparent; }
-
 paned > separator, .sidebar paned > separator, .sidebar .view paned > separator {
   min-width: 1px;
   min-height: 1px;
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 1f8b1eb..dfbfb8a 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -814,10 +814,13 @@ headerbar {
   color: rgba(82, 93, 118, 0.8);
   background-color: #e7e8eb; }
   .csd headerbar {
+    border-radius: 4px 4px 0 0;
     background-color: rgba(231, 232, 235, 0.95);
     border-color: rgba(212, 213, 219, 0.95); }
   headerbar:backdrop {
     color: rgba(82, 93, 118, 0.5); }
+    .csd headerbar:backdrop {
+      background-color: rgba(239, 240, 242, 0.95); }
   headerbar .title {
     padding-left: 12px;
     padding-right: 12px; }
@@ -908,13 +911,26 @@ headerbar {
     .maximized .titlebar:backdrop, .csd .maximized .titlebar:backdrop {
       background-color: #eff0f2; }
   window > .titlebar:not(headerbar),
-  window.csd > .titlebar:not(headerbar) {
+  window.csd > .titlebar:not(headerbar), window > .titlebar:backdrop:not(headerbar),
+  window.csd > .titlebar:backdrop:not(headerbar) {
     padding: 0;
     border: none;
     background: none; }
   .titlebar separator, .titlebar .sidebar .view separator, .sidebar .view .titlebar separator {
     background-color: rgba(212, 213, 219, 0.95); }
 
+paned.titlebar separator, paned.titlebar .sidebar .view separator, .sidebar .view paned.titlebar separator {
+  background-color: transparent; }
+
+paned.titlebar > headerbar::not(:only-child):not(:first-child):not(:last-child) {
+  border-radius: 0; }
+
+paned.titlebar > headerbar:first-child {
+  border-top-right-radius: 0; }
+
+paned.titlebar > headerbar:last-child {
+  border-top-left-radius: 0; }
+
 headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
   margin-top: 6px;
   margin-bottom: 6px; }
@@ -2334,9 +2350,6 @@ placesview .server-list-button:checked > image {
   transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   -gtk-icon-transform: rotate(-0.5turn); }
 
-placesview row.activatable:hover {
-  background-color: transparent; }
-
 paned > separator, .sidebar paned > separator, .sidebar .view paned > separator {
   min-width: 1px;
   min-height: 1px;
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index 9085f90..4be7e31 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -863,11 +863,16 @@ headerbar {
   background-color: opacify($header_bg, 1);
 
   .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); }
+  &:backdrop {
+    color: transparentize($header_fg, 0.3);
+
+    .csd & { background-color: $header_bg_backdrop; }
+  }
 
   .title {
     padding-left: 12px;
@@ -990,7 +995,8 @@ headerbar {
   }
 
   // Fixes double backgrounds on paned headerbars
-  &:not(headerbar) {
+  &:not(headerbar),
+  &:backdrop:not(headerbar) {
     window > &,
     window.csd > & {
       padding: 0;
@@ -1002,6 +1008,17 @@ headerbar {
   separator { background-color: $header_border; }
 }
 
+// more paned headerbar fixes (Gedit)
+paned.titlebar {
+  separator { background-color: transparent; }
+
+  > headerbar {
+    &::not(:only-child):not(:first-child):not(:last-child) { border-radius: 0;}
+    &:first-child { border-top-right-radius: 0; }
+    &:last-child { border-top-left-radius: 0; } 
+  }
+}
+
 // Only extending headerbar avoids some problems (Gnome Documents searchbar)
 headerbar {
   separator.titlebutton { @extend %header_separator; }
@@ -2444,14 +2461,11 @@ placesview {
     transition: 200ms $ease-out-quad;
     -gtk-icon-transform: rotate(-0.5turn);
   }
-
-  row.activatable:hover { background-color: transparent; }
 }
 
 //
 // Paned
 //
-
 paned {
   > separator {
     min-width: 1px;