GTK+-3.18 TOKTest: adjust panel settings

1 files changed, 73 insertions, 47 deletions

diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css b/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css
index f4dd70a0..724b2a77 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css
@@ -60,15 +60,24 @@ CajaNavigationWindow.background .view.caja-canvas-item:selected {
  * mate-panel *
  ***************/
 
-.mate-panel-menu-bar,
-MatePanelApplet > GtkMenuBar.menubar,
-PanelToplevel,
-PanelWidget,
-PanelFrame,
-PanelAppletFrame,
-MatePanelAppletFrameDBus,
-MatePanelAppletContainer,
-MatePanelApplet {
+/* first make all transparent */
+WnckSelector.menubar,
+PanelMenuBar.menubar,
+WnckSelector GtkMenuItem,
+PanelMenuBar GtkMenuItem,
+#clock-applet-button.button,
+MatePanelApplet GtkToggleButton.button,
+PanelToplevel.background,
+.mate-panel-menu-bar {
+    background-color: transparent;
+    background: transparent;
+    border-image: none;
+    background-image: none;
+    box-shadow: none;
+}
+
+PanelToplevel.background.horizontal,
+.mate-panel-menu-bar {
 	background-image: -gtk-gradient (linear,
 	                  left top,
 	                  left bottom,
@@ -83,17 +92,15 @@ MatePanelApplet {
 
 /* set selected menubar button */
 PanelMenuBar.menubar .menuitem:hover {
+	background-image: none;
 	background-color: shade(@theme_selected_bg_color, 1.1);
-	border-style: solid;
-	border-width: 1px 1px 0px;
-	border-color: @menubar_menuitem_hover_border_color;
-	border-radius: 3px 3px 0 0;
-	color: @menubar_menuitem_hover_color;
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  left bottom,
-	                  from (@menubar_menuitem_hover_gradient_a),
-	                  to (@menubar_menuitem_hover_gradient_d));
+	border-style: none;
+	border-image: none;
+	/* join menuitem to menu */
+	border-radius: 3px 3px 0px 0px;
+	border-width: 0px;
+	text-shadow: none;
+	padding: 3px 5px;
 }
 
 /* set menubar menuitem */
@@ -102,21 +109,20 @@ PanelMenuBar.menubar .menu .menuitem {
 	color: @theme_text_color;
 	border-style: solid;
 	border-width: 1px;
-	border-radius: 3px;
-	border-color: @theme_base_color;
+	border-radius: 0px;
+	border-color: alpha(@theme_bg_color, 0.1);
 	padding: 6px 5px;
 }
 
 /* set selected menubar menuitem */
-PanelMenuBar.menubar .menu .menuitem:checked:hover,
-PanelMenuBar.menubar .menu .menuitem:active:hover,
 PanelMenuBar.menubar .menu .menuitem:hover {
 	background-image: none;
-	color: @theme_selected_fg_color;
+	color: @theme_text_color;
 	border-style: solid;
 	border-width: 1px;
-	border-radius: 3px;
+	border-radius: 0px;
 	border-color: alpha(@theme_selected_bg_color, 0.1);
+	padding: 6px 5px;
 }
 
 MatePanelApplet {
@@ -133,15 +139,11 @@ PanelSeparator {
 /* desktop-applet, clockapplet, drivemount, character-map,
 dictionary */
 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,
@@ -152,11 +154,13 @@ MatePanelApplet .button {
 	                  to (@button_gradient_d));
 }
 
+#clock-applet-button.button.flat:checked:hover,
+#clock-applet-button.button.flat:checked,
 MatePanelApplet .button:checked:hover,
-MatePanelApplet .button:checked,
-MatePanelApplet .button:active:hover,
-MatePanelApplet .button:active {
+MatePanelApplet .button:checked {
 	border-style: solid;
+	border-width: 1px;
+    border-color: @border_color;
 	background-image: linear-gradient(to bottom,
 	                  @button_active_gradient_a,
 	                  @button_active_gradient_b 3px,
@@ -166,37 +170,42 @@ MatePanelApplet .button:active {
 	                  @button_active_gradient_f);
 }
 
+#clock-applet-button.button.flat:hover,
 MatePanelApplet .button:hover {
 	border-style: solid;
+	border-width: 1px;
+    border-color: @border_color;
 	background-image: linear-gradient(to bottom,
 	                                  @button_gradient_color_b,
 	                                  @button_gradient_color_a);
 }
 
+#clock-applet-button.button.flat {
+    border-style: solid;
+    border-color: transparent;
+	border-width: 1px;
+}
+
 /*Wncklist */
-WnckTasklist .button {
-	padding: 0px;
+WnckTasklist .button.flat {
+	padding: 4px 2px;
 	border-radius: 3px;
 	border-width: 1px;
 	border-style: solid;
+    border-color: transparent;
 	text-shadow: none;
-
 	color: @theme_fg_color;
 	background-color: transparent;
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  left bottom,
-	                  from (@button_gradient_a),
-	                  color-stop (0.50, @button_gradient_b),
-	                  color-stop (0.50, @button_gradient_c),
-	                  to (@button_gradient_d));
+	background-image: none;
 }
 
-WnckTasklist .button:checked:hover,
-WnckTasklist .button:checked,
-WnckTasklist .button:active:hover,
-WnckTasklist .button:active {
+WnckTasklist .button.flat:checked:hover,
+WnckTasklist .button.flat:checked {
+	padding: 4px 2px;
 	border-style: solid;
+	border-width: 1px;
+	border-radius: 3px;
+    border-color: @border_color;
 	background-color: transparent;
 	background-image: linear-gradient(to bottom,
 	                  @button_active_gradient_a,
@@ -207,8 +216,11 @@ WnckTasklist .button:active {
 	                  @button_active_gradient_f);
 }
 
-WnckTasklist .button:hover {
+WnckTasklist .button.flat:hover {
+	padding: 4px 2px;
 	border-style: solid;
+	border-width: 1px;
+	border-radius: 3px;
 	background-color: transparent;
 	background-image: linear-gradient(to bottom,
 	                  @button_hover_gradient_c);
@@ -228,6 +240,20 @@ MatePanelApplet > WnckSelector.menubar .menuitem:hover {
 	                  @button_active_gradient_f);
 }
 
+/* set selected button WnckSelector */
+.mate-panel-window-menu-menu-bar .menuitem:hover,
+MatePanelApplet > WnckSelector.menubar .menuitem:hover {
+	color: @theme_fg_color;
+	border-style: solid;
+	background-image: linear-gradient(to bottom,
+	                  @button_active_gradient_a,
+	                  @button_active_gradient_b 3px,
+	                  @button_active_gradient_c 4px,
+	                  @button_active_gradient_d 50%,
+	                  @button_active_gradient_e 50%,
+	                  @button_active_gradient_f);
+}
+
 /* set WnckSelector selected menuitem */
 .mate-panel-window-menu-menu-bar .menu .menuitem:hover,
 MatePanelApplet > WnckSelector.menubar .menu .menuitem:hover {