BlackMate GTK3: adjust button.flat in caja, pluma and m-c-c

2 files changed, 79 insertions, 55 deletions

diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
index f13c76c8..3382c1f8 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
@@ -1175,9 +1175,8 @@ GtkComboBox .menu {
     border-image: none;
 }
 
-/* mate-control-center */
 .button.flat:hover {
-    border-radius: 8px;
+    border-radius: 3px;
 }
 
 .button GtkImage,
@@ -1643,12 +1642,12 @@ GtkMenuButton .menu {
 .primary-toolbar .button:insensitive:hover,
 .primary-toolbar .toolbar .button:insensitive:hover,
 .primary-toolbar.toolbar .button:insensitive:hover {
-	border-style: solid;
-	border-width: 1px;
-	border-image: none;
-	border-color: transparent;
-	background-image: none;
-	background-color: transparent;
+    border-style: solid;
+    border-width: 1px;
+    border-image: none;
+    border-color: transparent;
+    background-image: none;
+    background-color: transparent;
 }
 
 .notebook GtkContainer .toolbar .button,
@@ -1670,16 +1669,16 @@ GtkMenuButton .menu {
 .primary-toolbar .button:hover,
 .primary-toolbar .toolbar .button:hover,
 .primary-toolbar.toolbar .button:hover {
-	border-style: solid;
-	border-color: shade(@button_border, 1.1);
-	border-radius: 3px;
-	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-style: solid;
+    border-color: shade(@button_border, 1.1);
+    border-radius: 3px;
+    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)));
 }
 
 .notebook GtkContainer .toolbar .button:hover,
@@ -1696,10 +1695,9 @@ GtkMenuButton .menu {
 .toolbar GtkComboBox .button,
 .primary-toolbar .toolbar GtkComboBox .button,
 .primary-toolbar.toolbar GtkComboBox .button {
-	border-radius: 3px;
-	background-image: linear-gradient(to bottom,
-	                                  @button_hover_gradient_color_a,
-	                                  @button_hover_gradient_color_b);
+    border-radius: 3px;
+    background-image: none;
+
 }
 
 .toolbar .button:active:hover,
@@ -1709,16 +1707,16 @@ GtkMenuButton .menu {
 .toolbar GtkComboBox .button:hover,
 .primary-toolbar .toolbar GtkComboBox .button:hover,
 .primary-toolbar.toolbar GtkComboBox .button:hover {
-	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-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)));
 }
 
 .toolbar .button:active:insensitive,
@@ -1728,36 +1726,33 @@ GtkMenuButton .menu {
 .toolbar GtkComboBox .button:insensitive,
 .primary-toolbar .toolbar GtkComboBox .button:insensitive,
 .primary-toolbar.toolbar GtkComboBox .button:insensitive {
-	border-image: none;
-	border-style: solid;
-	/*border-radius: 3;*/
-	border-color: @inactive_frame_color;
-	background-image: linear-gradient(to bottom,
-	                                  @button_hover_gradient_color_a,
-	                                  @button_hover_gradient_color_b);
+    border-image: none;
+    border-style: solid;
+    /*border-radius: 3;*/
+    border-color: @inactive_frame_color;
+    background-image: linear-gradient(to bottom,
+                                      @button_hover_gradient_color_a,
+                                      @button_hover_gradient_color_b);
 }
 
 .toolbar GtkSeparatorToolItem {
-	-GtkWidget-separator-width: 1;
-
-	border-style: solid;
-	border-width: 1px;
-	border-color: shade(@theme_bg_color, 0.85);
+    -GtkWidget-separator-width: 1;
+    border-style: solid;
+    border-width: 1px;
+    border-color: shade(@theme_bg_color, 0.85);
 }
 
 /* progressbars on primary toolbar entries are special */
 .toolbar .entry.progressbar {
-	background-image: linear-gradient(to bottom,
-	                                  @trough_bg_color_a,
-	                                  @trough_bg_color_b);
-
-	border-width: 1px;
-	border-radius: 2px;
-	border-style: solid;
-	border-color: shade(@inactive_frame_color, 0.925);
-	border-image: none;
-
-	color: @theme_text_color;
+    background-image: linear-gradient(to bottom,
+                                      @trough_bg_color_a,
+                                      @trough_bg_color_b);
+    border-width: 1px;
+    border-radius: 2px;
+    border-style: solid;
+    border-color: shade(@inactive_frame_color, 0.925);
+    border-image: none;
+    color: @theme_text_color;
 }
 
 /*******************
diff --git a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
index 1b8687a3..225a646a 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
@@ -146,8 +146,17 @@ CajaWindow .notebook .rubberband {
 }
 
 /* Caja places bar */
+CajaWindow .button.flat {
+    border-style: none;
+    border-image: url("assets/primary-toolbar-button-active-border-dark.svg") 3 / 3px stretch;
+    border-radius: 3px;
+    padding: 2px 5px;
+}
+
 CajaWindow .button.flat:hover {
+    border-image: none;
     border-radius: 3px;
+    padding: 2px 5px;
 }
 
 /**** Sidebar ***/
@@ -488,7 +497,27 @@ NaTrayApplet {
  *********/
 
 /* Pluma status bar */
+PlumaWindow .button.flat {
+    border-style: none;
+    border-image: url("assets/primary-toolbar-button-active-border-dark.svg") 3 / 3px stretch;
+    border-radius: 5px;
+}
+
 PlumaWindow .button.flat:hover {
+    border-image: none;
     border-radius: 5px;
 }
 
+/***********************
+ * Mate-Control-Center *
+ ***********************/
+
+GtkScrolledWindow .button.flat {
+    border-image: none;
+}
+
+/* button hover of applications */
+GtkScrolledWindow .button.flat:hover {
+    border-radius: 8px;
+}
+