gedit: fix headerbar transparency with 3.18

7 files changed, 129 insertions, 28 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 8bf354e..8e415f8 100644
--- a/common/gtk-3.0/3.18/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-dark.css
@@ -4013,11 +4013,25 @@ GeditWindow.background.csd {
   GeditWindow.background.csd .pane-separator,
   GeditWindow.background.csd .pane-separator:hover {
     background-color: rgba(42, 45, 55, 0.95); }
-  GeditWindow.background.csd .titlebar .pane-separator,
-  GeditWindow.background.csd.maximized .titlebar .pane-separator,
-  GeditWindow.background.csd .titlebar .pane-separator:backdrop,
-  GeditWindow.background.csd.maximized .titlebar .pane-separator:backdrop {
+  GeditWindow.background.csd .gedit-headerbar-paned.titlebar .pane-separator,
+  GeditWindow.background.csd.maximized .gedit-headerbar-paned.titlebar .pane-separator,
+  GeditWindow.background.csd .gedit-headerbar-paned.titlebar .pane-separator:backdrop,
+  GeditWindow.background.csd.maximized .gedit-headerbar-paned.titlebar .pane-separator:backdrop {
     background-color: rgba(38, 42, 51, 0.97); }
+  GeditWindow.background.csd .gedit-headerbar-paned.titlebar {
+    background-color: transparent; }
+  GeditWindow.background.csd .gedit-titlebar-left,
+  GeditWindow.background.csd .gedit-titlebar-right {
+    background-color: rgba(47, 52, 63, 0.97); }
+    GeditWindow.background.csd .gedit-titlebar-left:backdrop,
+    GeditWindow.background.csd .gedit-titlebar-right:backdrop {
+      background-color: rgba(50, 56, 67, 0.97); }
+  GeditWindow.background.csd.maximized .gedit-titlebar-left,
+  GeditWindow.background.csd.maximized .gedit-titlebar-right {
+    background-color: #2f343f; }
+    GeditWindow.background.csd.maximized .gedit-titlebar-left:backdrop,
+    GeditWindow.background.csd.maximized .gedit-titlebar-right:backdrop {
+      background-color: #323843; }
 
 .gedit-bottom-panel-paned {
   background-color: #404552; }
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 d030b8f..6e5d5df 100644
--- a/common/gtk-3.0/3.18/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-darker.css
@@ -4006,11 +4006,25 @@ GeditWindow.background.csd {
   GeditWindow.background.csd .pane-separator,
   GeditWindow.background.csd .pane-separator:hover {
     background-color: rgba(53, 57, 69, 0.95); }
-  GeditWindow.background.csd .titlebar .pane-separator,
-  GeditWindow.background.csd.maximized .titlebar .pane-separator,
-  GeditWindow.background.csd .titlebar .pane-separator:backdrop,
-  GeditWindow.background.csd.maximized .titlebar .pane-separator:backdrop {
+  GeditWindow.background.csd .gedit-headerbar-paned.titlebar .pane-separator,
+  GeditWindow.background.csd.maximized .gedit-headerbar-paned.titlebar .pane-separator,
+  GeditWindow.background.csd .gedit-headerbar-paned.titlebar .pane-separator:backdrop,
+  GeditWindow.background.csd.maximized .gedit-headerbar-paned.titlebar .pane-separator:backdrop {
     background-color: rgba(38, 42, 51, 0.97); }
+  GeditWindow.background.csd .gedit-headerbar-paned.titlebar {
+    background-color: transparent; }
+  GeditWindow.background.csd .gedit-titlebar-left,
+  GeditWindow.background.csd .gedit-titlebar-right {
+    background-color: rgba(47, 52, 63, 0.97); }
+    GeditWindow.background.csd .gedit-titlebar-left:backdrop,
+    GeditWindow.background.csd .gedit-titlebar-right:backdrop {
+      background-color: rgba(50, 56, 67, 0.97); }
+  GeditWindow.background.csd.maximized .gedit-titlebar-left,
+  GeditWindow.background.csd.maximized .gedit-titlebar-right {
+    background-color: #2f343f; }
+    GeditWindow.background.csd.maximized .gedit-titlebar-left:backdrop,
+    GeditWindow.background.csd.maximized .gedit-titlebar-right:backdrop {
+      background-color: #323843; }
 
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
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 c00c529..26b48ac 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
@@ -4013,11 +4013,25 @@ GeditWindow.background.csd {
   GeditWindow.background.csd .pane-separator,
   GeditWindow.background.csd .pane-separator:hover {
     background-color: #2a2d37; }
-  GeditWindow.background.csd .titlebar .pane-separator,
-  GeditWindow.background.csd.maximized .titlebar .pane-separator,
-  GeditWindow.background.csd .titlebar .pane-separator:backdrop,
-  GeditWindow.background.csd.maximized .titlebar .pane-separator:backdrop {
+  GeditWindow.background.csd .gedit-headerbar-paned.titlebar .pane-separator,
+  GeditWindow.background.csd.maximized .gedit-headerbar-paned.titlebar .pane-separator,
+  GeditWindow.background.csd .gedit-headerbar-paned.titlebar .pane-separator:backdrop,
+  GeditWindow.background.csd.maximized .gedit-headerbar-paned.titlebar .pane-separator:backdrop {
     background-color: #262a33; }
+  GeditWindow.background.csd .gedit-headerbar-paned.titlebar {
+    background-color: transparent; }
+  GeditWindow.background.csd .gedit-titlebar-left,
+  GeditWindow.background.csd .gedit-titlebar-right {
+    background-color: #2f343f; }
+    GeditWindow.background.csd .gedit-titlebar-left:backdrop,
+    GeditWindow.background.csd .gedit-titlebar-right:backdrop {
+      background-color: #323843; }
+  GeditWindow.background.csd.maximized .gedit-titlebar-left,
+  GeditWindow.background.csd.maximized .gedit-titlebar-right {
+    background-color: #2f343f; }
+    GeditWindow.background.csd.maximized .gedit-titlebar-left:backdrop,
+    GeditWindow.background.csd.maximized .gedit-titlebar-right:backdrop {
+      background-color: #323843; }
 
 .gedit-bottom-panel-paned {
   background-color: #404552; }
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 f15c0e4..4201c4a 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
@@ -4006,11 +4006,25 @@ GeditWindow.background.csd {
   GeditWindow.background.csd .pane-separator,
   GeditWindow.background.csd .pane-separator:hover {
     background-color: #353945; }
-  GeditWindow.background.csd .titlebar .pane-separator,
-  GeditWindow.background.csd.maximized .titlebar .pane-separator,
-  GeditWindow.background.csd .titlebar .pane-separator:backdrop,
-  GeditWindow.background.csd.maximized .titlebar .pane-separator:backdrop {
+  GeditWindow.background.csd .gedit-headerbar-paned.titlebar .pane-separator,
+  GeditWindow.background.csd.maximized .gedit-headerbar-paned.titlebar .pane-separator,
+  GeditWindow.background.csd .gedit-headerbar-paned.titlebar .pane-separator:backdrop,
+  GeditWindow.background.csd.maximized .gedit-headerbar-paned.titlebar .pane-separator:backdrop {
     background-color: #262a33; }
+  GeditWindow.background.csd .gedit-headerbar-paned.titlebar {
+    background-color: transparent; }
+  GeditWindow.background.csd .gedit-titlebar-left,
+  GeditWindow.background.csd .gedit-titlebar-right {
+    background-color: #2f343f; }
+    GeditWindow.background.csd .gedit-titlebar-left:backdrop,
+    GeditWindow.background.csd .gedit-titlebar-right:backdrop {
+      background-color: #323843; }
+  GeditWindow.background.csd.maximized .gedit-titlebar-left,
+  GeditWindow.background.csd.maximized .gedit-titlebar-right {
+    background-color: #2f343f; }
+    GeditWindow.background.csd.maximized .gedit-titlebar-left:backdrop,
+    GeditWindow.background.csd.maximized .gedit-titlebar-right:backdrop {
+      background-color: #323843; }
 
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
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 7078f20..178c689 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid.css
@@ -4010,11 +4010,25 @@ GeditWindow.background.csd {
   GeditWindow.background.csd .pane-separator,
   GeditWindow.background.csd .pane-separator:hover {
     background-color: #353945; }
-  GeditWindow.background.csd .titlebar .pane-separator,
-  GeditWindow.background.csd.maximized .titlebar .pane-separator,
-  GeditWindow.background.csd .titlebar .pane-separator:backdrop,
-  GeditWindow.background.csd.maximized .titlebar .pane-separator:backdrop {
+  GeditWindow.background.csd .gedit-headerbar-paned.titlebar .pane-separator,
+  GeditWindow.background.csd.maximized .gedit-headerbar-paned.titlebar .pane-separator,
+  GeditWindow.background.csd .gedit-headerbar-paned.titlebar .pane-separator:backdrop,
+  GeditWindow.background.csd.maximized .gedit-headerbar-paned.titlebar .pane-separator:backdrop {
     background-color: #d4d5db; }
+  GeditWindow.background.csd .gedit-headerbar-paned.titlebar {
+    background-color: transparent; }
+  GeditWindow.background.csd .gedit-titlebar-left,
+  GeditWindow.background.csd .gedit-titlebar-right {
+    background-color: #e7e8eb; }
+    GeditWindow.background.csd .gedit-titlebar-left:backdrop,
+    GeditWindow.background.csd .gedit-titlebar-right:backdrop {
+      background-color: #eff0f2; }
+  GeditWindow.background.csd.maximized .gedit-titlebar-left,
+  GeditWindow.background.csd.maximized .gedit-titlebar-right {
+    background-color: #e7e8eb; }
+    GeditWindow.background.csd.maximized .gedit-titlebar-left:backdrop,
+    GeditWindow.background.csd.maximized .gedit-titlebar-right:backdrop {
+      background-color: #eff0f2; }
 
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
diff --git a/common/gtk-3.0/3.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css
index 3bb1850..30e0170 100644
--- a/common/gtk-3.0/3.18/gtk-contained.css
+++ b/common/gtk-3.0/3.18/gtk-contained.css
@@ -4010,11 +4010,25 @@ GeditWindow.background.csd {
   GeditWindow.background.csd .pane-separator,
   GeditWindow.background.csd .pane-separator:hover {
     background-color: rgba(53, 57, 69, 0.95); }
-  GeditWindow.background.csd .titlebar .pane-separator,
-  GeditWindow.background.csd.maximized .titlebar .pane-separator,
-  GeditWindow.background.csd .titlebar .pane-separator:backdrop,
-  GeditWindow.background.csd.maximized .titlebar .pane-separator:backdrop {
+  GeditWindow.background.csd .gedit-headerbar-paned.titlebar .pane-separator,
+  GeditWindow.background.csd.maximized .gedit-headerbar-paned.titlebar .pane-separator,
+  GeditWindow.background.csd .gedit-headerbar-paned.titlebar .pane-separator:backdrop,
+  GeditWindow.background.csd.maximized .gedit-headerbar-paned.titlebar .pane-separator:backdrop {
     background-color: rgba(212, 213, 219, 0.95); }
+  GeditWindow.background.csd .gedit-headerbar-paned.titlebar {
+    background-color: transparent; }
+  GeditWindow.background.csd .gedit-titlebar-left,
+  GeditWindow.background.csd .gedit-titlebar-right {
+    background-color: rgba(231, 232, 235, 0.95); }
+    GeditWindow.background.csd .gedit-titlebar-left:backdrop,
+    GeditWindow.background.csd .gedit-titlebar-right:backdrop {
+      background-color: rgba(239, 240, 242, 0.95); }
+  GeditWindow.background.csd.maximized .gedit-titlebar-left,
+  GeditWindow.background.csd.maximized .gedit-titlebar-right {
+    background-color: #e7e8eb; }
+    GeditWindow.background.csd.maximized .gedit-titlebar-left:backdrop,
+    GeditWindow.background.csd.maximized .gedit-titlebar-right:backdrop {
+      background-color: #eff0f2; }
 
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
diff --git a/common/gtk-3.0/3.18/sass/_transparent_widgets.scss b/common/gtk-3.0/3.18/sass/_transparent_widgets.scss
index 49d0436..340f757 100644
--- a/common/gtk-3.0/3.18/sass/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.18/sass/_transparent_widgets.scss
@@ -161,10 +161,27 @@ GeditWindow.background.csd {
   .pane-separator,
   .pane-separator:hover { background-color: $dark_sidebar_border; }
 
-  .titlebar .pane-separator,
-  &.maximized .titlebar .pane-separator,
-  .titlebar .pane-separator:backdrop,
-  &.maximized .titlebar .pane-separator:backdrop { background-color: $header_border; }
+  .gedit-headerbar-paned.titlebar .pane-separator,
+  &.maximized .gedit-headerbar-paned.titlebar .pane-separator,
+  .gedit-headerbar-paned.titlebar .pane-separator:backdrop,
+  &.maximized .gedit-headerbar-paned.titlebar .pane-separator:backdrop { background-color: $header_border; }
+
+  .gedit-headerbar-paned.titlebar { background-color: transparent; }
+
+  .gedit-titlebar-left,
+  .gedit-titlebar-right {
+    background-color: $header_bg;
+
+    &:backdrop { background-color: $header_bg_backdrop; }
+  }
+
+  &.maximized .gedit-titlebar-left,
+  &.maximized .gedit-titlebar-right {
+    background-color: opacify($header_bg, 1);
+
+    &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+  }
+
 }
 
 .gedit-bottom-panel-paned { background-color: $base_color; }