Merge branch 'master' into dark_variant

1 files changed, 15 insertions, 3 deletions

diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css
index 43e3cb3..3a503e9 100644
--- a/common/gtk-3.0/3.16/gtk-contained.css
+++ b/common/gtk-3.0/3.16/gtk-contained.css
@@ -858,9 +858,23 @@ GtkComboBox {
   padding-right: 7px;
   border-radius: 4px 4px 0 0;
   color: rgba(82, 93, 118, 0.8);
+  background-color: #e7e8eb;
   box-shadow: inset 0 1px rgba(239, 240, 242, 0.95); }
+  .csd .titlebar {
+    background-color: rgba(231, 232, 235, 0.95); }
   .titlebar:backdrop {
-    color: rgba(82, 93, 118, 0.5); }
+    color: rgba(82, 93, 118, 0.5);
+    background-color: #e7e8eb; }
+    .csd .titlebar:backdrop {
+      background-color: rgba(239, 240, 242, 0.95); }
+  .maximized .titlebar {
+    background-color: #e7e8eb; }
+    .maximized .titlebar:backdrop {
+      background-color: #eff0f2; }
+
+.titlebar .titlebar,
+.titlebar .titlebar:backdrop {
+  background-color: transparent; }
 
 .primary-toolbar .separator, .primary-toolbar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .primary-toolbar .view.separator, .header-bar .header-bar-separator, .header-bar > GtkBox > .separator.vertical {
   -GtkWidget-wide-separators: true;
@@ -2760,8 +2774,6 @@ MarlinViewWindow *:selected:focus {
 
 PantheonTerminalPantheonTerminalWindow.background {
   background-color: transparent; }
-  PantheonTerminalPantheonTerminalWindow.background .titlebar {
-    background-color: rgba(231, 232, 235, 0.95); }
   PantheonTerminalPantheonTerminalWindow.background .notebook.header.top {
     box-shadow: inset 0 1px #d4d5db, inset 0 -1px #edf0f3; }