Traditional themes GTk3: adjust flat buttons, fix m-c-c

6 files changed, 159 insertions, 25 deletions

diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
index caccc7ff..c9486cea 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
@@ -449,6 +449,25 @@ GtkComboBox.combobox-entry .button {
 	padding: 1px 4px;
 }
 
+.button.default {
+	text-shadow: none;
+	color: @theme_fg_color;
+}
+
+.button.flat {
+	border-color: transparent;
+	background-color: transparent;
+	background-image: none;
+	box-shadow: inset 0 1px rgba(255,255,255,0), 0 1px rgba(255,255,255,0);
+	text-shadow: none;
+	icon-shadow: none;
+	border-image: none;
+}
+
+.button.flat.hover {
+	border-radius: 3px;
+}
+
 .button {
 	-GtkButton-image-spacing: 4;
 	-GtkButton-interior-focus: true;
diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css b/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css
index 5ee4a146..e9992743 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css
@@ -58,6 +58,17 @@ PanelMenuBar.menubar .menuitem:hover {
 	padding: 3px 5px;
 }
 
+/* set menubar menuitem */
+PanelMenuBar.menubar .menu .menuitem {
+	background-image: none;
+	color: @theme_text_color;
+	border-style: solid;
+	border-width: 1px;
+	border-radius: 3px;
+	border-color: alpha(@theme_bg_color, 0.1);
+	padding: 3px 5px;
+}
+
 /* set selected menubar menuitem */
 PanelMenuBar.menubar .menu .menuitem:active:hover,
 PanelMenuBar.menubar .menu .menuitem:hover {
@@ -87,12 +98,10 @@ MatePanelApplet .button {
 	/* 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: none;
-
 	color: @theme_fg_color;
 	background-image: -gtk-gradient (linear,
 	                  left top,
@@ -129,7 +138,6 @@ WnckTasklist .button {
 	border-width: 1px;
 	border-style: solid;
 	text-shadow: none;
-
 	color: @theme_fg_color;
 	background-color: transparent;
 	background-image: -gtk-gradient (linear,
@@ -202,17 +210,17 @@ WnckPager {
 }
 
 /* prelight of WnckPager */
-MatePanelApplet *:hover {
+WnckPager:hover {
 	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 2.86),
-		shade (@theme_selected_bg_color, 1.0));
+		shade (@theme_selected_bg_color, 1.86),
+		shade (@theme_selected_bg_color, 0.8));
 	background-color: @theme_base_color;
 }
 
 /* Classic icon style */
-/*.mate-panel-menu-bar {
+.mate-panel-menu-bar {
 	-PanelMenuBar-icon-visible: true;
-}*/
+}
 
 NaTrayApplet {
 	background-image: none;
@@ -220,6 +228,22 @@ NaTrayApplet {
 	padding: 0;
 	color: @theme_fg_color;
 	text-shadow: none;
-/*	-NaTrayApplet-icon-padding: 12;
-	-NaTrayApplet-icon-size: 16;*/
+	-NaTrayApplet-icon-padding: 12;
+	-NaTrayApplet-icon-size: 16;
 }
+
+/***********************
+ * Mate-Control-Center *
+ ***********************/
+
+ShellWindow .button.flat {
+    border-image: none;
+    padding: 3px;
+}
+
+/* button hover of applications */
+ShellWindow GtkScrolledWindow .button.flat:hover {
+    background-color: transparent;
+    padding: 3px;
+}
+
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
index caccc7ff..c9486cea 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
@@ -449,6 +449,25 @@ GtkComboBox.combobox-entry .button {
 	padding: 1px 4px;
 }
 
+.button.default {
+	text-shadow: none;
+	color: @theme_fg_color;
+}
+
+.button.flat {
+	border-color: transparent;
+	background-color: transparent;
+	background-image: none;
+	box-shadow: inset 0 1px rgba(255,255,255,0), 0 1px rgba(255,255,255,0);
+	text-shadow: none;
+	icon-shadow: none;
+	border-image: none;
+}
+
+.button.flat.hover {
+	border-radius: 3px;
+}
+
 .button {
 	-GtkButton-image-spacing: 4;
 	-GtkButton-interior-focus: true;
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css b/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css
index 5ee4a146..8783f251 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css
@@ -58,6 +58,17 @@ PanelMenuBar.menubar .menuitem:hover {
 	padding: 3px 5px;
 }
 
+/* set menubar menuitem */
+PanelMenuBar.menubar .menu .menuitem {
+	background-image: none;
+	color: @theme_text_color;
+	border-style: solid;
+	border-width: 1px;
+	border-radius: 3px;
+	border-color: alpha(@theme_bg_color, 0.1);
+	padding: 3px 5px;
+}
+
 /* set selected menubar menuitem */
 PanelMenuBar.menubar .menu .menuitem:active:hover,
 PanelMenuBar.menubar .menu .menuitem:hover {
@@ -87,12 +98,10 @@ MatePanelApplet .button {
 	/* 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: none;
-
 	color: @theme_fg_color;
 	background-image: -gtk-gradient (linear,
 	                  left top,
@@ -129,7 +138,6 @@ WnckTasklist .button {
 	border-width: 1px;
 	border-style: solid;
 	text-shadow: none;
-
 	color: @theme_fg_color;
 	background-color: transparent;
 	background-image: -gtk-gradient (linear,
@@ -143,6 +151,7 @@ WnckTasklist .button {
 
 WnckTasklist .button:active:hover,
 WnckTasklist .button:active {
+	padding: 0px;
 	border-style: solid;
 	background-color: transparent;
 	background-image: linear-gradient(to bottom,
@@ -155,6 +164,7 @@ WnckTasklist .button:active {
 }
 
 WnckTasklist .button:hover {
+	padding: 0px;
 	border-style: solid;
 	background-color: transparent;
 	background-image: linear-gradient(to bottom,
@@ -202,17 +212,17 @@ WnckPager {
 }
 
 /* prelight of WnckPager */
-MatePanelApplet *:hover {
+WnckPager:hover {
 	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 2.86),
+		shade (@theme_selected_bg_color, 1.86),
 		shade (@theme_selected_bg_color, 1.0));
 	background-color: @theme_base_color;
 }
 
 /* Classic icon style */
-/*.mate-panel-menu-bar {
+.mate-panel-menu-bar {
 	-PanelMenuBar-icon-visible: true;
-}*/
+}
 
 NaTrayApplet {
 	background-image: none;
@@ -220,6 +230,22 @@ NaTrayApplet {
 	padding: 0;
 	color: @theme_fg_color;
 	text-shadow: none;
-/*	-NaTrayApplet-icon-padding: 12;
-	-NaTrayApplet-icon-size: 16;*/
+	-NaTrayApplet-icon-padding: 12;
+	-NaTrayApplet-icon-size: 16;
+}
+
+/***********************
+ * Mate-Control-Center *
+ ***********************/
+
+ShellWindow .button.flat {
+    border-image: none;
+    padding: 3px;
 }
+
+/* button hover of applications */
+ShellWindow GtkScrolledWindow .button.flat:hover {
+    background-color: transparent;
+    padding: 3px;
+}
+
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css
index caccc7ff..c9486cea 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css
@@ -449,6 +449,25 @@ GtkComboBox.combobox-entry .button {
 	padding: 1px 4px;
 }
 
+.button.default {
+	text-shadow: none;
+	color: @theme_fg_color;
+}
+
+.button.flat {
+	border-color: transparent;
+	background-color: transparent;
+	background-image: none;
+	box-shadow: inset 0 1px rgba(255,255,255,0), 0 1px rgba(255,255,255,0);
+	text-shadow: none;
+	icon-shadow: none;
+	border-image: none;
+}
+
+.button.flat.hover {
+	border-radius: 3px;
+}
+
 .button {
 	-GtkButton-image-spacing: 4;
 	-GtkButton-interior-focus: true;
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css b/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css
index a0955e75..e8729172 100755..100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css
@@ -60,6 +60,17 @@ PanelMenuBar.menubar .menuitem:hover {
 	                  to (@menubar_menuitem_hover_gradient_d));
 }
 
+/* set menubar menuitem */
+PanelMenuBar.menubar .menu .menuitem {
+	background-image: none;
+	color: @theme_text_color;
+	border-style: solid;
+	border-width: 1px;
+	border-radius: 3px;
+	border-color: alpha(@theme_bg_color, 0.1);
+	padding: 3px 5px;
+}
+
 /* set selected menubar menuitem */
 PanelMenuBar.menubar .menu .menuitem:active:hover,
 PanelMenuBar.menubar .menu .menuitem:hover {
@@ -204,17 +215,17 @@ WnckPager {
 }
 
 /* prelight of WnckPager */
-MatePanelApplet *:hover {
+WnckPager:hover {
 	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 2.86),
+		shade (@theme_selected_bg_color, 1.86),
 		shade (@theme_selected_bg_color, 1.0));
 	background-color: @theme_base_color;
 }
 
 /* Classic icon style */
-/*.mate-panel-menu-bar {
+.mate-panel-menu-bar {
 	-PanelMenuBar-icon-visible: true;
-}*/
+}
 
 NaTrayApplet {
 	background-image: none;
@@ -222,8 +233,8 @@ NaTrayApplet {
 	padding: 0;
 	color: @theme_fg_color;
 	text-shadow: none;
-/*	-NaTrayApplet-icon-padding: 12;
-	-NaTrayApplet-icon-size: 16;*/
+	-NaTrayApplet-icon-padding: 12;
+	-NaTrayApplet-icon-size: 16;
 }
 
 /*********
@@ -243,3 +254,19 @@ TerminalWindow .entry {
 	background-color: @theme_base_color;
 	color: @theme_fg_color;
 }
+
+/***********************
+ * Mate-Control-Center *
+ ***********************/
+
+ShellWindow .button.flat {
+    border-image: none;
+    padding: 3px;
+}
+
+/* button hover of applications */
+ShellWindow GtkScrolledWindow .button.flat:hover {
+    background-color: transparent;
+    padding: 3px;
+}
+