BlackMATE GTK3: major sync for Mate

1 files changed, 177 insertions, 88 deletions

diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
index 3b43ef38..d4cd6c97 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
@@ -1110,6 +1110,7 @@ GtkComboBox .menu {
  * Buttons *
  ***********/
 .button {
+    -GtkWidget-focus-line-width: 0;
 	/* Due to a bug somewhere in gtk or cairo,
 	   a padding of zero (or even one) doesn't work always!!! */
 	padding: 2px;
@@ -1255,19 +1256,27 @@ GtkComboBox .menu {
 	background-image: linear-gradient(to top,
 	                                  shade(@scroll_slider_color, 0.6),
 	                                  shade(@scroll_slider_color, 1.6) 50%,
-	                                  shade(@scroll_slider_color, 3.4));
+	                                  shade(@scroll_slider_color, 2.0));
 	border-color: transparent;
-	border-radius: 5px;
-	border-width: 3px 2px 3px;
+	border-radius: 6px;
+	border-width: 1px;
 	border-image: none;
 }
 
 .scrollbar.slider.vertical {
-	border-width: 2px 3px 2px;
+	border-width: 1px;
+	background-image: linear-gradient(to top,
+	                                  shade(@scroll_slider_color, 0.6),
+	                                  shade(@scroll_slider_color, 1.6) 50%,
+	                                  shade(@scroll_slider_color, 2.0));
+}
+
+.scrollbar.slider.horizontal {
+	border-width: 1px;
 	background-image: linear-gradient(to left,
 	                                  shade(@scroll_slider_color, 0.6),
 	                                  shade(@scroll_slider_color, 1.6) 50%,
-	                                  shade(@scroll_slider_color, 3.4));
+	                                  shade(@scroll_slider_color, 2.0));
 }
 
 .scrollbar.slider:prelight {
@@ -1282,12 +1291,18 @@ GtkComboBox .menu {
 	border-radius: 6px;
 }
 
+.scrollbar.slider.horizontal:prelight {
+	border-width: 1px;
+	border-color: @scroll_slider_color;
+	border-radius: 6px;
+}
+
 .scrollbar.slider:prelight:active {
 	border-width: 1px;
 	border-color: @scroll_slider_color;
 	border-radius: 6px;
 	background-image: linear-gradient(to top,
-	                                  shade(@scroll_slider_color, 3.3),
+	                                  shade(@scroll_slider_color, 2.0),
 	                                  shade(@scroll_slider_color, 1.6) 55%,
 	                                  shade(@scroll_slider_color, 0.6));
 }
@@ -1296,8 +1311,18 @@ GtkComboBox .menu {
 	border-width: 1px;
 	border-color: @scroll_slider_color;
 	border-radius: 6px;
+	background-image: linear-gradient(to top,
+	                                  shade(@scroll_slider_color, 2.0),
+	                                  shade(@scroll_slider_color, 1.6) 55%,
+	                                  shade(@scroll_slider_color, 0.6));
+}
+
+.scrollbar.slider.horizontal:prelight:active {
+	border-width: 1px;
+	border-color: @scroll_slider_color;
+	border-radius: 6px;
 	background-image: linear-gradient(to left,
-	                                  shade(@scroll_slider_color, 3.3),
+	                                  shade(@scroll_slider_color, 2.0),
 	                                  shade(@scroll_slider_color, 1.6) 55%,
 	                                  shade(@scroll_slider_color, 0.6));
 }
@@ -1905,7 +1930,145 @@ GtkProgressBar.osd.progressbar {
 	background-image: linear-gradient(to bottom,
 	                                  @progressbar_background_a,
 	                                  @progressbar_background_b);
-	border-radius: 0;    
+	border-radius: 0; 
+}
+
+/*******
+ * CSD *
+ *******/
+
+.titlebar {
+    text-shadow: 0 1px @osd_text_shadow;
+ 
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_bg_color, 1.50),
+                                      shade (@theme_bg_color, 1.0));
+
+    border-radius: 7px 7px 0px 0px;
+}
+
+.tiled .titlebar {
+    border-radius: 0;
+}
+
+.maximized .titlebar {
+    border-radius: 0;
+}
+
+/* this is the default titlebar that is added by GTK
+ * when client-side decorations are in use and the application
+ * did not set a custom titlebar.
+ */
+.titlebar.default-decoration {
+    border: none;
+    box-shadow: none;
+}
+ 
+.titlebar .title {
+    font: Bold 10;
+    background: none;
+    color: #D9D9D9;
+}
+
+ /* Colour when unfocused? does this work?*/
+.titlebar:backdrop {
+    color: #747473;
+    text-shadow: none;
+    background-image: none;
+    background-color: #747473;
+}
+ 
+.titlebar .titlebutton,
+.header-bar.frame.titlebar .button.image-button.titlebutton,
+.button.text-button.titlebutton {
+	/* Due to a bug somewhere in gtk or cairo,
+	   a padding of zero (or even one) doesn't work always!!! */
+	padding: 0px;
+
+	border-radius: 3px;
+	border-width: 1px;
+	border-style: solid;
+	text-shadow: 0 -1px black;
+
+	color: #D9D9D9;
+	background-image: -gtk-gradient (radial,
+					0.5 -2.0, 2.0,
+					0.5 -2.0, 3.0,
+					from (shade(@button_gradient_color_a, 1.5)),
+					color-stop (0.42, shade(@button_gradient_color_a, 0.7)),
+					color-stop (0.43, @theme_bg_color),
+					to (shade(@button_gradient_color_b, 0.7)));
+}
+ 
+.titlebar .titlebutton:hover,
+.header-bar.frame.titlebar .button.image-button.titlebutton:hover,
+.button.text-button.titlebutton:hover {
+	border-image: none;
+	border-style: solid;
+	border-color: shade(@button_border, 1.1);
+	background-image: linear-gradient(to bottom,
+	                                  @button_hover_gradient_color_a,
+	                                  @button_hover_gradient_color_b);
+}
+ 
+.titlebar .titlebutton:active,
+.titlebar .titlebutton:active:hover,
+.header-bar.frame.titlebar:active,
+.header-bar.frame.titlebar:active:hover,
+.button.image-button.titlebutton:active,
+.button.image-button.titlebutton:active:hover,
+.button.text-button.titlebutton:active,
+.button.text-button.titlebutton:active:hover {
+	/* some apps need this */
+	color: @theme_fg_color;
+	border-style: solid;
+	background-image: linear-gradient(to bottom,
+	                                  shade(@button_gradient_color_b, 0.7),
+	                                  @theme_bg_color 50%,
+	                                  shade(@button_gradient_color_a, 1.5));
+}
+ 
+.titlebar .right .titlebutton:first-child {
+    border-left: 1px solid @menu_separator; 
+}
+ 
+.titlebar .right .titlebutton:last-child {
+ 
+}
+ 
+.titlebar .left .titlebutton:last-child {
+    border-right: 1px solid @menu_separator; 
+}
+ 
+.titlebar .left .titlebutton:first-child {
+ 
+}
+ 
+.titlebar .titlebutton:backdrop,
+.titlebar .titlebutton:hover:backdrop,
+.header-bar.frame.titlebar .button.image-button.titlebutton:backdrop,
+.header-bar.frame.titlebar .button.image-button.titlebutton:hover:backdrop {
+    background: none;
+    color: @theme_main_color;
+    border-image: none;
+    icon-shadow: none;
+}
+
+.titlebar .titlebutton:hover:backdrop,
+.header-bar.frame.titlebar .button.image-button.titlebutton:hover:backdrop {
+	color: #747473;
+}
+ 
+.window-frame {
+    border-color: darker(@theme_bg_color);
+    border-radius: 9px 9px 0 0;
+    border-width: 1px;
+    border-style: solid;
+    background-color: @theme_bg_color;
+    box-shadow: 0 0 0 2px @osd_button_shadow, 0 2px 8px 3px @osd_button_shadow;
+
+    /* this is used for the resize cursor area */
+    margin: 10px;
 }
 
 /****************************
@@ -2615,86 +2778,6 @@ EphyWindow GtkProgressBar.trough {
 	background-color: shade(@theme_selected_bg_color, 1.23);
 }
 
-/**********************
- * Fallback Mode Panel
- **********************/
-.gnome-panel-menu-bar,
-PanelApplet > GtkMenuBar.menubar,
-PanelToplevel,
-PanelWidget,
-PanelAppletFrame,
-PanelApplet {
-	background-color: @os_chrome_bg_color;
-	background-image: none;
-	color: @os_chrome_fg_color;
-}
-
-ClockBox,
-.gnome-panel-menu-bar,
-PanelApplet > GtkMenuBar.menubar {
-	font: bold;
-}
-
-.gnome-panel-menu-bar .menuitem:hover,
-PanelApplet > GtkMenuBar.menubar .menuitem:hover {
-	background-color: @os_chrome_selected_bg_color;
-	color: @os_chrome_selected_fg_color;
-}
-
-PanelApplet .button,
-PanelApplet .button:hover {
-	padding: 4px;
-
-	border-image: none;
-	border-width: 0;
-	border-radius: 0;
-
-	background-image: none;
-	background-color: transparent;
-
-	color: @os_chrome_fg_color;
-}
-
-PanelApplet .button:active:hover,
-PanelApplet .button:active {
-	border-image: none;
-	background-image: none;
-	background-color: @os_chrome_selected_bg_color;
-	border-width: 0px;
-	border-radius: 0;
-}
-
-PanelApplet *:hover {
-	color: @os_chrome_selected_fg_color;
-}
-
-PanelApplet *:active,
-PanelApplet *:hover:active {
-	color: @os_chrome_selected_fg_color;
-}
-
-NaTrayApplet {
-    -NaTrayApplet-icon-padding: 12;
-    -NaTrayApplet-icon-size: 16;
-}
-
-WnckPager, WnckTasklist {
-	background-color: @os_chrome_selected_bg_color;
-	background-image: none;
-	color: @os_chrome_fg_color;
-}
-
-GsmFailWhaleDialog {
-	background-color: @os_chrome_bg_color;
-	background-image: none;
-	color: @os_chrome_fg_color;
-}
-
-GsmFailWhaleDialog * {
-	background-color: @os_chrome_bg_color;
-	background-image: none;
-}
-
 /************
  * Nautilus *
  ************/
@@ -2733,6 +2816,12 @@ NemoWindow .view {
 	color: @theme_fg_color;
 }
 
+/* the small line between sidebar and view */
+NautilusWindow * ,
+NemoWindow * {
+	-GtkPaned-handle-size: 2px;
+}
+
 NautilusWindow GtkPaned,
 NemoWindow GtkPaned {
 	background-color: @less_dark_color;