Merge branch 'master' into dark_variant

common/gtk-2.0/assets.txt

@@ -38,15 +38,17 @@ menu-radio-checked
 menu-radio-checked-insensitive
 menu-radio-unchecked
 menu-radio-unchecked-insensitive
-entry
-entry-focus
-entry-insensitive
-entry-notebook
-entry-focus-notebook
-entry-insensitive-notebook
-entry-toolbar
-entry-focus-toolbar
-entry-insensitive-toolbar
+entry-border-bg-solid
+entry-border-active-bg-solid
+entry-border-disabled-bg
+entry-border-bg
+entry-border-active-bg
+notebook-entry-border-bg
+notebook-entry-border-active-bg
+notebook-entry-border-disabled-bg
+toolbar-entry-border-bg
+toolbar-entry-border-active-bg
+toolbar-entry-border-disabled-bg
 entry-border-fill
 combo-entry
 combo-entry-focus
@@ -115,3 +117,4 @@ tab-left-active
 tab-right-active
 inline-toolbar
 toolbar
+menubar

common/gtk-2.0/gtkrc

@@ -689,13 +689,46 @@ style "menubar" {
 
   bg[NORMAL] = "#e7e8eb"
   fg[NORMAL] = "#70788d"
-  fg[SELECTED] = @selected_fg_color
+  fg[SELECTED] = @fg_color
   fg[INSENSITIVE] = shade(1.3, "#70788d")
 
   xthickness = 0
   ythickness = 0
+
+  engine "pixmap" {
+
+    image {
+      function = BOX
+      file  = "assets/menubar.png"
+      stretch  = TRUE
+      border = { 1, 1, 1, 1 }
+    }
+  }
 }
 
+style "menubar-borderless" {
+
+  bg[NORMAL] = "#e7e8eb"
+  fg[NORMAL] = "#70788d"
+  fg[SELECTED] = @fg_color
+  fg[INSENSITIVE] = shade(1.3, "#70788d")
+
+  xthickness = 0
+  ythickness = 0
+
+  engine "pixmap" {
+
+    image {
+      function = BOX
+      file  = "assets/null.png"
+      stretch  = TRUE
+      border = { 1, 1, 1, 1 }
+    }
+  }
+
+}
+
+
 style "menu" {
 
   xthickness = 0
@@ -737,10 +770,8 @@ style "menu_item"
   # highlight. The price to pay is black text on menus as well,
   # but at least it's readable.
   # See https://bugs.freedesktop.org/show_bug.cgi?id=38038
-  bg[SELECTED] = @fg_color
+  bg[SELECTED] = @selected_fg_color
 
-  bg[PRELIGHT] = @fg_color
-  fg[PRELIGHT] = @fg_color
   text[PRELIGHT] = @fg_color
 
   engine "pixmap" {
@@ -1046,7 +1077,7 @@ style "entry" {
       detail = "entry"
       state = NORMAL
       shadow = IN
-      file = "assets/entry.png"
+      file = "assets/entry-border-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -1056,7 +1087,7 @@ style "entry" {
       detail = "entry"
       state = INSENSITIVE
       shadow = IN
-      file = "assets/entry-insensitive.png"
+      file = "assets/entry-border-disabled-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -1065,7 +1096,7 @@ style "entry" {
       function = SHADOW
       detail = "entry"
       state = ACTIVE
-      file = "assets/entry-focus.png"
+      file = "assets/entry-border-active-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -1100,7 +1131,7 @@ style "notebook_entry" {
       detail = "entry"
       state = NORMAL
       shadow = IN
-      file = "assets/entry-notebook.png"
+      file = "assets/notebook-entry-border-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -1110,7 +1141,7 @@ style "notebook_entry" {
       detail = "entry"
       state = INSENSITIVE
       shadow = IN
-      file = "assets/entry-insensitive-notebook.png"
+      file = "assets/notebook-entry-border-disabled-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -1119,10 +1150,28 @@ style "notebook_entry" {
       function = SHADOW
       detail = "entry"
       state = ACTIVE
-      file = "assets/entry-focus-notebook.png"
+      file = "assets/notebook-entry-border-active-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
+
+    image {
+      function = FLAT_BOX
+      detail = "entry_bg"
+      state = NORMAL
+      overlay_file = "assets/null.png"
+      overlay_border = { 0, 0, 0, 0 }
+      overlay_stretch = TRUE
+    }
+
+    image {
+      function = FLAT_BOX
+      detail = "entry_bg"
+      state = ACTIVE
+      overlay_file = "assets/null.png"
+      overlay_border = { 0, 0, 0, 0 }
+      overlay_stretch = TRUE
+    }
   }
 }
 
@@ -1136,7 +1185,7 @@ style "toolbar_entry" {
       detail = "entry"
       state = NORMAL
       shadow = IN
-      file = "assets/entry-toolbar.png"
+      file = "assets/toolbar-entry-border-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -1146,7 +1195,7 @@ style "toolbar_entry" {
       detail = "entry"
       state = INSENSITIVE
       shadow = IN
-      file = "assets/entry-insensitive-toolbar.png"
+      file = "assets/toolbar-entry-border-disabled-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -1155,10 +1204,28 @@ style "toolbar_entry" {
       function = SHADOW
       detail = "entry"
       state = ACTIVE
-      file = "assets/entry-focus-toolbar.png"
+      file = "assets/toolbar-entry-border-active-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
+
+    image {
+      function = FLAT_BOX
+      detail = "entry_bg"
+      state = NORMAL
+      overlay_file = "assets/null.png"
+      overlay_border = { 0, 0, 0, 0 }
+      overlay_stretch = TRUE
+    }
+
+    image {
+      function = FLAT_BOX
+      detail = "entry_bg"
+      state = ACTIVE
+      overlay_file = "assets/null.png"
+      overlay_border = { 0, 0, 0, 0 }
+      overlay_stretch = TRUE
+    }
   }
 }
 
@@ -1730,7 +1797,7 @@ style "libreoffice_entry" {
       detail = "entry"
       state = NORMAL
       shadow = IN
-      file = "assets/entry.png"
+      file = "assets/entry-border-bg-solid.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -1739,7 +1806,7 @@ style "libreoffice_entry" {
       function = SHADOW
       detail = "entry"
       state = ACTIVE
-      file = "assets/entry-focus.png"
+      file = "assets/entry-border-active-bg-solid.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -1773,7 +1840,7 @@ style "standalone_entry" {
     detail = "entry"
     state = NORMAL
     shadow = IN
-    file = "assets/entry.png"
+    file = "assets/entry-border-bg-solid.png"
     border = { 12, 12, 12, 12 }
     stretch = TRUE
     }
@@ -1782,7 +1849,7 @@ style "standalone_entry" {
     function = SHADOW
     detail = "entry"
     state = ACTIVE
-    file = "assets/entry-focus.png"
+    file = "assets/entry-border-active-bg-solid.png"
     border = { 12, 12, 12, 12 }
     stretch = TRUE
     }
@@ -1964,7 +2031,7 @@ style "combobox_button" {
 }
 
 style "range" {
-	
+
   engine "pixmap" {
 
     image {
@@ -2479,8 +2546,8 @@ widget_class "*<GtkNotebook>*<GtkComboBoxEntry>*<GtkEntry>"                 styl
 widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkComboBoxEntry>*<GtkEntry>"   style "combobox_entry"
 
 # The same thing for toolbars
-widget_class "*<GtkToolbar>*<GtkEntry>"                                    style "toolbar_entry"
-widget_class "*<GtkToolbar>*<GtkEventBox>*<GtkEntry>"                      style "entry"
+#widget_class "*<GtkToolbar>*<GtkEntry>"                                    style "toolbar_entry"
+#widget_class "*<GtkToolbar>*<GtkEventBox>*<GtkEntry>"                      style "entry"
 
 # We also need to avoid changing fg color for the inactive notebook tab labels
 widget_class "*<GtkNotebook>.<GtkLabel>"                            style "notebook_tab_label"
@@ -2523,3 +2590,11 @@ widget "*libreoffice-toplevel*GtkSpinButton"                        style "libre
 widget_class "*XfdesktopIconView*"                                  style "xfdesktop-icon-view"
 widget "xfwm4-tabwin*"                                              style "xfwm-tabwin"
 widget "xfwm4-tabwin*GtkButton*"                                    style "xfwm-tabwin-button"
+
+# Whitelist for dark toolbars
+widget_class "*ThunarWindow*<GtkMenuBar>"                           style "menubar-borderless"
+widget_class "*CajaNavigationWindow*<GtkMenuBar>"                   style "menubar-borderless"
+widget_class "*ThunarWindow*<GtkToolbar>*<GtkEntry>"                style "toolbar_entry"
+widget_class "*CajaNavigationWindow*<GtkToolbar>*<GtkEntry>"        style "toolbar_entry"
+widget_class "*ThunarWindow*<GtkToolbar>"                           style "menubar"
+widget_class "*CajaNavigationWindow*<GtkToolbar>"                   style "menubar"

common/gtk-3.0/3.14/_applications.scss

@@ -638,8 +638,6 @@ MarlinViewWindow *:selected:focus {
 PantheonTerminalPantheonTerminalWindow.background {
    background-color: transparent;
 
-   .titlebar { background-color: $header_bg; }
-
   .notebook {
 
     &.header.top {

common/gtk-3.0/3.14/_common.scss

@@ -1125,11 +1125,29 @@ GtkComboBox {
   padding-right: 7px;
   border-radius: 4px 4px 0 0;
   color: $header_fg;
+  background-color: opacify($header_bg, 1);
   box-shadow: inset 0  1px lighten($header_bg, 3%);
 
-  &:backdrop { color: transparentize($header_fg, 0.3); }
+  .csd & { background-color: $header_bg; }
+
+  &:backdrop {
+    color: transparentize($header_fg, 0.3);
+    background-color: opacify($header_bg, 1);
+
+    .csd & { background-color: lighten($header_bg, 3%); }
+  }
+
+  .maximized & {
+    background-color: opacify($header_bg, 1);
+
+    &:backdrop { background-color: opacify(lighten($header_bg, 3%), 1); }
+  }
 }
 
+
+.titlebar .titlebar,
+.titlebar .titlebar:backdrop { background-color: transparent; }
+
 // Only extending .header-bar avoids some problems (Gnome Documents searchbar)
 .header-bar {
   .header-bar-separator,

common/gtk-3.0/3.14/gtk-contained-solid.css

@@ -851,9 +851,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 #eff0f2; }
+  .csd .titlebar {
+    background-color: #e7e8eb; }
   .titlebar:backdrop {
-    color: rgba(82, 93, 118, 0.5); }
+    color: rgba(82, 93, 118, 0.5);
+    background-color: #e7e8eb; }
+    .csd .titlebar:backdrop {
+      background-color: #eff0f2; }
+  .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;
@@ -2815,8 +2829,6 @@ MarlinViewWindow *:selected:focus {
 
 PantheonTerminalPantheonTerminalWindow.background {
   background-color: transparent; }
-  PantheonTerminalPantheonTerminalWindow.background .titlebar {
-    background-color: #e7e8eb; }
   PantheonTerminalPantheonTerminalWindow.background .notebook.header.top {
     box-shadow: inset 0 1px #d4d5db, inset 0 -1px #edf0f3; }
 

common/gtk-3.0/3.14/gtk-contained.css

@@ -851,9 +851,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;
@@ -2815,8 +2829,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; }
 

common/gtk-3.0/3.16/_applications.scss

@@ -686,7 +686,6 @@ MarlinViewWindow *:selected:focus {
 PantheonTerminalPantheonTerminalWindow.background {
    background-color: transparent;
 
-   .titlebar { background-color: $header_bg; }
 
   .notebook {
 

common/gtk-3.0/3.16/_common.scss

@@ -1135,11 +1135,28 @@ GtkComboBox {
   padding-right: 7px;
   border-radius: 4px 4px 0 0;
   color: $header_fg;
+  background-color: opacify($header_bg, 1);
   box-shadow: inset 0  1px lighten($header_bg, 3%);
 
-  &:backdrop { color: transparentize($header_fg, 0.3); }
+  .csd & { background-color: $header_bg; }
+
+  &:backdrop {
+    color: transparentize($header_fg, 0.3);
+    background-color: opacify($header_bg, 1);
+
+    .csd & { background-color: lighten($header_bg, 3%); }
+  }
+
+  .maximized & {
+    background-color: opacify($header_bg, 1);
+
+    &:backdrop { background-color: opacify(lighten($header_bg, 3%), 1); }
+  }
 }
 
+.titlebar .titlebar,
+.titlebar .titlebar:backdrop { background-color: transparent; }
+
 // Only extending .header-bar avoids some problems (Gnome Documents searchbar)
 .header-bar {
   .header-bar-separator,

common/gtk-3.0/3.16/gtk-contained-solid.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 #eff0f2; }
+  .csd .titlebar {
+    background-color: #e7e8eb; }
   .titlebar:backdrop {
-    color: rgba(82, 93, 118, 0.5); }
+    color: rgba(82, 93, 118, 0.5);
+    background-color: #e7e8eb; }
+    .csd .titlebar:backdrop {
+      background-color: #eff0f2; }
+  .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: #e7e8eb; }
   PantheonTerminalPantheonTerminalWindow.background .notebook.header.top {
     box-shadow: inset 0 1px #d4d5db, inset 0 -1px #edf0f3; }
 

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; }