BlackMate GTK3: fix button-flat

2 files changed, 115 insertions, 75 deletions

diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
index bc2a3d9a..c89323a1 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
@@ -384,10 +384,13 @@ GtkHTML.entry {
 	background-color: @view_color;
 }
 
-/* for Totem's search */
-/*.entry GtkEntry {
+.entry.cursor-handle,
+.cursor-handle {
 	background-color: transparent;
-}*/
+	background-image: none;
+	box-shadow: none;
+	border-style: none;
+}
 
 .cursor-handle.top,
 .cursor-handle.bottom {
@@ -1152,20 +1155,17 @@ GtkComboBox .menu {
  ***********/
 .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;
-	border-radius: 3px;
-	border-width: 1px;
-	border-style: solid;
-	text-shadow: 0 -1px black;
-	color: @theme_fg_color;
-	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);
+    /* Due to a bug somewhere in gtk or cairo,
+       a padding of zero (or even one) doesn't work always!!! */
+    padding: 2px;
+    border-radius: 3px;
+    border-width: 1px;
+    border-style: solid;
+    text-shadow: 0 -1px black;
+    color: @theme_fg_color;
+    background-image: linear-gradient(to bottom,
+                                      @button_hover_gradient_color_a,
+                                      @button_hover_gradient_color_b);
     transition: all 400ms ease-out;
 }
 
@@ -1193,6 +1193,7 @@ GtkComboBox .menu {
     border-image: none;
 }
 
+/* mate-control-center */
 .button.flat:hover {
     border-radius: 8px;
 }
@@ -1545,7 +1546,6 @@ GtkComboBox .menu {
     background-image: linear-gradient(to bottom,
                                       @theme_selected_bg_color,
                                       shade(@theme_selected_bg_color, 0.5));
-
     border-style: none;
     border-width: 0px;
     border-radius: 0;
@@ -1830,11 +1830,11 @@ GtkMenuButton .menu {
 
 
 .header-bar .button.text-button {
-	padding: 2px 16px;
+    padding: 2px 16px;
 }
 
 .header-bar .button.image-button {
-	padding: 5px 4px 4px 5px;
+    padding: 5px 4px 4px 5px;
 }
 
 /*******
diff --git a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
index 6838c5a5..1b8687a3 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
@@ -145,6 +145,11 @@ CajaWindow .notebook .rubberband {
 	/*border-radius: 6;*/
 }
 
+/* Caja places bar */
+CajaWindow .button.flat:hover {
+    border-radius: 3px;
+}
+
 /**** Sidebar ***/
 
 /* FIXME has no effect*/
@@ -260,7 +265,7 @@ CajaQueryEditor .toolbar .entry:focus {
 }
 
 /****************
- * Mate-Panel *
+ * Mate-Panel   *
  ****************/
 
 /* the panel bar itself */
@@ -290,15 +295,17 @@ PanelMenuBar.menubar * {
 	text-shadow: none;
 }
 
+PanelMenuBar.menubar .menuitem {
+    transition: all 300ms ease-out;
+}
+
 /* set selected menubar button */
 PanelMenuBar.menubar .menuitem:hover {
-    transition: all 300ms ease-out;
 }
 
 /* set selected menubar menuitem */
 PanelMenuBar.menubar .menu .menuitem:active:hover,
 PanelMenuBar.menubar .menu .menuitem:hover {
-    transition: all 300ms ease-out;
 }
 
 MatePanelApplet {
@@ -317,69 +324,73 @@ PanelSeparator {
 
 /* desktop-applet, clockapplet, drivemount, character-map,
 dictionary */
-MatePanelApplet .button {
-	border-radius: 1px;
-	transition: all 400ms ease-out;
-	/* Due to a bug somewhere in gtk or cairo,
-	   a padding of zero (or even one) doesn't work always!!! */
-	padding: 2px;
-	border-width: 1px;
-	border-style: solid;
-	text-shadow: 0 -1px black;
-	color: @theme_fg_color;
-	background-image: linear-gradient(to bottom,
-	                                  @button_hover_gradient_color_a,
-	                                  @button_hover_gradient_color_b);
+MatePanelApplet .button,
+MatePanelApplet .button.flat {
+    transition: all 400ms ease-out;
+    border-radius: 1px;
+    transition: all 400ms ease-out;
+    /* Due to a bug somewhere in gtk or cairo,
+       a padding of zero (or even one) doesn't work always!!! */
+    padding: 2px;
+    border-radius: 3px;
+    border-width: 1px;
+    border-style: solid;
+    text-shadow: 0 -1px black;
+    color: @theme_fg_color;
+    background-image: linear-gradient(to bottom,
+                                      @button_hover_gradient_color_a,
+                                      @button_hover_gradient_color_b);
 }
 
 MatePanelApplet .button:active:hover,
 MatePanelApplet .button:active {
-	border-radius: 1px;
-	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));
-}
-
-MatePanelApplet .button:hover {
-	border-radius: 1px;
-	border-image: none;
-	border-style: solid;
-	border-color: shade(@button_border, 1.1);
-	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)));
+    border-radius: 3px;
+    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));
+}
+
+MatePanelApplet .button:hover,
+MatePanelApplet .button.flat:hover {
+    border-radius: 3px;
+    border-image: none;
+    border-style: solid;
+    border-color: shade(@button_border, 1.1);
+    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)));
 }
 
 /*Wncklist */
 WnckTasklist .button {
-	transition: all 400ms ease-out;
-	/* Due to a bug somewhere in gtk or cairo,
-	   a padding of zero (or even one) doesn't work always!!! */
-	padding: 2px;
-	border-radius: 1px;
-	border-width: 1px;
-	border-style: solid;
-	text-shadow: 0 -1px black;
-	color: @theme_fg_color;
-	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)));
+    transition: all 400ms ease-out;
+    /* Due to a bug somewhere in gtk or cairo,
+       a padding of zero (or even one) doesn't work always!!! */
+    padding: 2px;
+    border-radius: 3px;
+    border-width: 1px;
+    border-style: solid;
+    text-shadow: 0 -1px black;
+    color: @theme_fg_color;
+    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)));
 }
 
 WnckTasklist .button:active:hover,
 WnckTasklist .button:active {
-	border-radius: 1px;
+	border-radius: 3px;
 	color: @theme_fg_color;
 	border-style: solid;
 	background-image: linear-gradient(to bottom,
@@ -389,7 +400,7 @@ WnckTasklist .button:active {
 }
 
 WnckTasklist .button:hover {
-	border-radius: 1px;
+	border-radius: 3px;
 	border-image: none;
 	border-style: solid;
 	border-color: shade(@button_border, 1.1);
@@ -400,6 +411,16 @@ WnckTasklist .button:hover {
 	                                  shade(@less_dark_color, 0.4));
 }
 
+/* set button WnckSelector */
+MatePanelApplet > WnckSelector.menubar .menuitem {
+    border-radius: 3px;
+    color: @theme_fg_color;
+    border-style: solid;
+    background-image: linear-gradient(to bottom,
+                                      @button_hover_gradient_color_a,
+                                      @button_hover_gradient_color_b);
+}
+
 /* set selected button WnckSelector */
 .mate-panel-window-menu-menu-bar .menuitem:hover,
 MatePanelApplet > WnckSelector.menubar .menuitem:hover {
@@ -411,6 +432,16 @@ MatePanelApplet > WnckSelector.menubar .menuitem:hover {
 	                                  shade(@button_gradient_color_a, 1.5));
 }
 
+/* set WnckSelector menuitem */
+.mate-panel-window-menu-menu-bar .menu .menuitem,
+MatePanelApplet > WnckSelector.menubar .menu .menuitem {
+    background-image:  none;
+    color: @theme_text_color;
+    border-style: none;
+    border-width: 0px;
+    border-radius: 0px;
+}
+
 /* set WnckSelector selected menuitem */
 .mate-panel-window-menu-menu-bar .menu .menuitem:hover,
 MatePanelApplet > WnckSelector.menubar .menu .menuitem:hover {
@@ -452,3 +483,12 @@ NaTrayApplet {
 	-NaTrayApplet-icon-size: 16;
 }
 
+/*********
+ * Pluma *
+ *********/
+
+/* Pluma status bar */
+PlumaWindow .button.flat:hover {
+    border-radius: 5px;
+}
+