fix default-decorations under elementary OS

8 files changed, 120 insertions, 0 deletions

diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css
index 6b7a92d..2e76f77 100644
--- a/common/gtk-3.0/3.14/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-dark.css
@@ -996,6 +996,15 @@ GtkComboBox {
     border-color: #262a33; }
     .maximized .header-bar:backdrop {
       border-color: #262a33; }
+  .header-bar.default-decoration,
+  .csd .header-bar.default-decoration {
+    padding-top: 5px;
+    padding-bottom: 5px;
+    background-color: #2f343f;
+    border-bottom-width: 0; }
+    .header-bar.default-decoration:backdrop,
+    .csd .header-bar.default-decoration:backdrop {
+      background-color: #2f343f; }
 
 .titlebar {
   padding-left: 7px;
@@ -2452,6 +2461,11 @@ GtkVolumeButton.button {
   .window-frame.csd.message-dialog {
     border-radius: 3px; }
 
+.header-bar.default-decoration .button.titlebutton, .titlebar.default-decoration .button.titlebutton,
+.header-bar.selection-mode.default-decoration .button.titlebutton, .titlebar.selection-mode.default-decoration .button.titlebutton {
+  padding-top: 0px;
+  padding-bottom: 0px; }
+
 .header-bar .button.titlebutton, .titlebar .button.titlebutton,
 .header-bar.selection-mode .button.titlebutton, .titlebar.selection-mode .button.titlebutton {
   padding: 7px 4px;
@@ -3890,6 +3904,9 @@ GeditWindow.background.csd {
   background-color: transparent; }
   GeditWindow.background.csd .pane-separator {
     background-color: rgba(42, 45, 55, 0.95); }
+  GeditWindow.background.csd > .titlebar.default-decoration,
+  GeditWindow.background.csd > .titlebar.default-decoration:backdrop {
+    background-color: #2f343f; }
 
 .gedit-bottom-panel-paned {
   background-color: #404552; }
diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css
index 5d9f82f..dca07d7 100644
--- a/common/gtk-3.0/3.14/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-darker.css
@@ -999,6 +999,15 @@ GtkComboBox {
     border-color: #262a33; }
     .maximized .header-bar:backdrop {
       border-color: #262a33; }
+  .header-bar.default-decoration,
+  .csd .header-bar.default-decoration {
+    padding-top: 5px;
+    padding-bottom: 5px;
+    background-color: #2f343f;
+    border-bottom-width: 0; }
+    .header-bar.default-decoration:backdrop,
+    .csd .header-bar.default-decoration:backdrop {
+      background-color: #2f343f; }
 
 .titlebar {
   padding-left: 7px;
@@ -2455,6 +2464,11 @@ GtkVolumeButton.button {
   .window-frame.csd.message-dialog {
     border-radius: 3px; }
 
+.header-bar.default-decoration .button.titlebutton, .titlebar.default-decoration .button.titlebutton,
+.header-bar.selection-mode.default-decoration .button.titlebutton, .titlebar.selection-mode.default-decoration .button.titlebutton {
+  padding-top: 0px;
+  padding-bottom: 0px; }
+
 .header-bar .button.titlebutton, .titlebar .button.titlebutton,
 .header-bar.selection-mode .button.titlebutton, .titlebar.selection-mode .button.titlebutton {
   padding: 7px 4px;
@@ -3883,6 +3897,9 @@ GeditWindow.background.csd {
   background-color: transparent; }
   GeditWindow.background.csd .pane-separator {
     background-color: rgba(53, 57, 69, 0.95); }
+  GeditWindow.background.csd > .titlebar.default-decoration,
+  GeditWindow.background.csd > .titlebar.default-decoration:backdrop {
+    background-color: #2f343f; }
 
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
index 8e72931..e815030 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
@@ -996,6 +996,15 @@ GtkComboBox {
     border-color: #262a33; }
     .maximized .header-bar:backdrop {
       border-color: #262a33; }
+  .header-bar.default-decoration,
+  .csd .header-bar.default-decoration {
+    padding-top: 5px;
+    padding-bottom: 5px;
+    background-color: #2f343f;
+    border-bottom-width: 0; }
+    .header-bar.default-decoration:backdrop,
+    .csd .header-bar.default-decoration:backdrop {
+      background-color: #2f343f; }
 
 .titlebar {
   padding-left: 7px;
@@ -2452,6 +2461,11 @@ GtkVolumeButton.button {
   .window-frame.csd.message-dialog {
     border-radius: 3px; }
 
+.header-bar.default-decoration .button.titlebutton, .titlebar.default-decoration .button.titlebutton,
+.header-bar.selection-mode.default-decoration .button.titlebutton, .titlebar.selection-mode.default-decoration .button.titlebutton {
+  padding-top: 0px;
+  padding-bottom: 0px; }
+
 .header-bar .button.titlebutton, .titlebar .button.titlebutton,
 .header-bar.selection-mode .button.titlebutton, .titlebar.selection-mode .button.titlebutton {
   padding: 7px 4px;
@@ -3890,6 +3904,9 @@ GeditWindow.background.csd {
   background-color: transparent; }
   GeditWindow.background.csd .pane-separator {
     background-color: #2a2d37; }
+  GeditWindow.background.csd > .titlebar.default-decoration,
+  GeditWindow.background.csd > .titlebar.default-decoration:backdrop {
+    background-color: #2f343f; }
 
 .gedit-bottom-panel-paned {
   background-color: #404552; }
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
index 31f6e5a..073614b 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
@@ -999,6 +999,15 @@ GtkComboBox {
     border-color: #262a33; }
     .maximized .header-bar:backdrop {
       border-color: #262a33; }
+  .header-bar.default-decoration,
+  .csd .header-bar.default-decoration {
+    padding-top: 5px;
+    padding-bottom: 5px;
+    background-color: #2f343f;
+    border-bottom-width: 0; }
+    .header-bar.default-decoration:backdrop,
+    .csd .header-bar.default-decoration:backdrop {
+      background-color: #2f343f; }
 
 .titlebar {
   padding-left: 7px;
@@ -2455,6 +2464,11 @@ GtkVolumeButton.button {
   .window-frame.csd.message-dialog {
     border-radius: 3px; }
 
+.header-bar.default-decoration .button.titlebutton, .titlebar.default-decoration .button.titlebutton,
+.header-bar.selection-mode.default-decoration .button.titlebutton, .titlebar.selection-mode.default-decoration .button.titlebutton {
+  padding-top: 0px;
+  padding-bottom: 0px; }
+
 .header-bar .button.titlebutton, .titlebar .button.titlebutton,
 .header-bar.selection-mode .button.titlebutton, .titlebar.selection-mode .button.titlebutton {
   padding: 7px 4px;
@@ -3883,6 +3897,9 @@ GeditWindow.background.csd {
   background-color: transparent; }
   GeditWindow.background.csd .pane-separator {
     background-color: #353945; }
+  GeditWindow.background.csd > .titlebar.default-decoration,
+  GeditWindow.background.csd > .titlebar.default-decoration:backdrop {
+    background-color: #2f343f; }
 
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css
index 23a67f7..20dcea4 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid.css
@@ -999,6 +999,15 @@ GtkComboBox {
     border-color: #d4d5db; }
     .maximized .header-bar:backdrop {
       border-color: #d4d5db; }
+  .header-bar.default-decoration,
+  .csd .header-bar.default-decoration {
+    padding-top: 5px;
+    padding-bottom: 5px;
+    background-color: #e7e8eb;
+    border-bottom-width: 0; }
+    .header-bar.default-decoration:backdrop,
+    .csd .header-bar.default-decoration:backdrop {
+      background-color: #e7e8eb; }
 
 .titlebar {
   padding-left: 7px;
@@ -2455,6 +2464,11 @@ GtkVolumeButton.button {
   .window-frame.csd.message-dialog {
     border-radius: 3px; }
 
+.header-bar.default-decoration .button.titlebutton, .titlebar.default-decoration .button.titlebutton,
+.header-bar.selection-mode.default-decoration .button.titlebutton, .titlebar.selection-mode.default-decoration .button.titlebutton {
+  padding-top: 0px;
+  padding-bottom: 0px; }
+
 .header-bar .button.titlebutton, .titlebar .button.titlebutton,
 .header-bar.selection-mode .button.titlebutton, .titlebar.selection-mode .button.titlebutton {
   padding: 7px 4px;
@@ -3883,6 +3897,9 @@ GeditWindow.background.csd {
   background-color: transparent; }
   GeditWindow.background.csd .pane-separator {
     background-color: #353945; }
+  GeditWindow.background.csd > .titlebar.default-decoration,
+  GeditWindow.background.csd > .titlebar.default-decoration:backdrop {
+    background-color: #e7e8eb; }
 
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css
index 2c3a372..6864b67 100644
--- a/common/gtk-3.0/3.14/gtk-contained.css
+++ b/common/gtk-3.0/3.14/gtk-contained.css
@@ -999,6 +999,15 @@ GtkComboBox {
     border-color: #d4d5db; }
     .maximized .header-bar:backdrop {
       border-color: #d4d5db; }
+  .header-bar.default-decoration,
+  .csd .header-bar.default-decoration {
+    padding-top: 5px;
+    padding-bottom: 5px;
+    background-color: #e7e8eb;
+    border-bottom-width: 0; }
+    .header-bar.default-decoration:backdrop,
+    .csd .header-bar.default-decoration:backdrop {
+      background-color: #e7e8eb; }
 
 .titlebar {
   padding-left: 7px;
@@ -2455,6 +2464,11 @@ GtkVolumeButton.button {
   .window-frame.csd.message-dialog {
     border-radius: 3px; }
 
+.header-bar.default-decoration .button.titlebutton, .titlebar.default-decoration .button.titlebutton,
+.header-bar.selection-mode.default-decoration .button.titlebutton, .titlebar.selection-mode.default-decoration .button.titlebutton {
+  padding-top: 0px;
+  padding-bottom: 0px; }
+
 .header-bar .button.titlebutton, .titlebar .button.titlebutton,
 .header-bar.selection-mode .button.titlebutton, .titlebar.selection-mode .button.titlebutton {
   padding: 7px 4px;
@@ -3883,6 +3897,9 @@ GeditWindow.background.csd {
   background-color: transparent; }
   GeditWindow.background.csd .pane-separator {
     background-color: rgba(53, 57, 69, 0.95); }
+  GeditWindow.background.csd > .titlebar.default-decoration,
+  GeditWindow.background.csd > .titlebar.default-decoration:backdrop {
+    background-color: #e7e8eb; }
 
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss
index 4051cc4..8ed1d94 100644
--- a/common/gtk-3.0/3.14/sass/_common.scss
+++ b/common/gtk-3.0/3.14/sass/_common.scss
@@ -1138,6 +1138,16 @@ GtkComboBox {
       border-color: opacify($header_border, 1);
     }
   }
+  &.default-decoration,
+  .csd &.default-decoration {
+    padding-top: 5px;	    // less padding for ssd
+    padding-bottom: 5px;    //
+    background-color: opacify($header_bg, 1);
+    border-bottom-width: 0;
+
+    //&:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+    &:backdrop { background-color: opacify($header_bg, 1); }
+  }
 }
 
 .titlebar {
@@ -2695,6 +2705,11 @@ GtkVolumeButton.button { padding: 8px; }
 .header-bar, .titlebar,
 .header-bar.selection-mode, .titlebar.selection-mode {
 
+  &.default-decoration .button.titlebutton { // no vertical padding for ssd buttons
+    padding-top: 0px;                        // already handled by the titlebar-padding
+    padding-bottom: 0px;
+  }
+
   .button.titlebutton {
     padding: 7px 4px;
 
diff --git a/common/gtk-3.0/3.14/sass/_transparent_widgets.scss b/common/gtk-3.0/3.14/sass/_transparent_widgets.scss
index c97956c..b04ed38 100644
--- a/common/gtk-3.0/3.14/sass/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.14/sass/_transparent_widgets.scss
@@ -120,6 +120,9 @@ GeditWindow.background.csd {
   background-color: transparent;
 
   .pane-separator { background-color: $dark_sidebar_border; }
+
+  > .titlebar.default-decoration,
+  > .titlebar.default-decoration:backdrop { background-color: opacify($header_bg, 1); }  // fix for elementary OS
 }
 
 .gedit-bottom-panel-paned { background-color: $base_color; }