TraditionalOKtest GTK3: majar sync for MATE

7 files changed, 274 insertions, 91 deletions

diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/Makefile.am b/desktop-themes/TraditionalOkTest/gtk-3.0/Makefile.am
index e898e022..62043376 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/Makefile.am
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/Makefile.am
@@ -8,6 +8,7 @@ theme_DATA = \
 	gtk-variant.css \
 	gtk-widgets.css \
 	gtk-widgets-img.css \
+	mate-applications \
 	settings.ini
 
 EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css b/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css
index 5ab26ec1..a3882f3a 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css
@@ -89,78 +89,6 @@ GtkIconView.documents-main-view.check {
 	border-radius: 3px;
 }
 
-/***************
- * gnome-panel *
- ***************/
-
-.gnome-panel-menu-bar,
-PanelApplet > GtkMenuBar.menubar,
-PanelToplevel,
-PanelWidget,
-PanelApplet {
-	background-color: @os_chrome_bg_color;
-	background-image: none;
-	color: @os_chrome_fg_color;
-}
-
-.gnome-panel-menu-bar,
-PanelApplet > GtkMenuBar.menubar,
-PanelApplet > GtkMenuBar.menubar.menuitem,
-PanelMenuBar.menubar,
-PanelMenuBar.menubar.menuitem {
-	-PanelMenuBar-icon-visible: true;
-}
-
-PanelAppletFrame {
-	background-color: @applet_frame_bg_color;
-	background-image: none;
-	color: @os_chrome_fg_color;
-}
-
-PanelApplet .button,
-PanelApplet .button:active,
-PanelApplet .button:hover,
-PanelApplet .button:hover:active {
-	border-image: url("img/border-gnome-panel-button.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
-}
-
-PanelApplet .menu .menuitem *:active {
-	color: @theme_text_color;
-}
-
-PanelApplet .menu .menuitem *:selected {
-	color: @theme_selected_fg_color;
-}
-
-PanelWidget > .button
-{
-	padding: 0;
-}
-
-WnckPager {
-	background-color: @pager_bg_color;
-}
-
-NaTrayApplet {
-	-NaTrayApplet-icon-padding: 7;
-	-NaTrayApplet-icon-size: 22;
-}
-
-GsmFailWhaleDialog {
-	background-color: @os_chrome_bg_color;
-	background-image: none;
-	color: @os_chrome_fg_color;
-}
-
-/******************
- * gnome-terminal *
- ******************/
-
-TerminalScreen {
-	background-color: @theme_base_color;
-	color: @theme_fg_color;
-}
-
 /*********
  * Unity *
  *********/
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-variant.css b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-variant.css
index a25e5e23..edfbf965 100644..100755
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-variant.css
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-variant.css
@@ -6,18 +6,26 @@
  * color scheme *
  ****************/
 
-@define-color theme_base_color #babdb6;
+@define-color base_color #babdb6;
+@define-color theme_base_color @base_color;
 
-@define-color theme_bg_color #888a85;
-@define-color theme_fg_color #f5f5f5;
+@define-color bg_color #888a85;
+@define-color theme_bg_color @bg_color;
+@define-color fg_color #000000;
+@define-color theme_fg_color @fg_color;
 
-@define-color theme_selected_bg_color #f57900;
-@define-color theme_selected_fg_color #ffffff;
+@define-color selected_bg_color #f57900;
+@define-color theme_selected_bg_color @selected_bg_color;
+@define-color selected_fg_color #ffffff;
+@define-color theme_selected_fg_color @selected_fg_color;
 
-@define-color theme_tooltip_bg_color #EAF5B5;
-@define-color theme_tooltip_fg_color #000000;
+@define-color tooltip_bg_color #EAF5B5;
+@define-color theme_tooltip_bg_color @tooltip_bg_color;
+@define-color tooltip_fg_color #000000;
+@define-color theme_tooltip_fg_color @tooltip_fg_color;
 
-@define-color theme_text_color #000000;
+@define-color text_color #000000;
+@define-color theme_text_color @text_color;
 
 @define-color link_color #0000ee;
 @define-color visited_link_color #551a8b;
@@ -37,8 +45,8 @@
 /* Core colors are only used in the current file, as bases for other
    color declarations. */
 
-@define-color core_color_a #f57900; /* Core color for blue widgets in Clearlooks-Phenix. */
-@define-color core_color_b #888a85; /* Core color for gray widgets in Clearlooks-Phenix. */
+@define-color core_color_a #f57900; /* Core color for orange widgets in TraditionalOKTest. */
+@define-color core_color_b #888a85; /* Core color for gray widgets in TraditionalOKTest. */
 
 /********************************************
  * End of configuration for color variants. *
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css
index 2b1f3d14..6abb49dd 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css
@@ -1092,7 +1092,7 @@ GtkTreeMenu .menuitem * {
 /* this controls the general appearance of the menubar */
 .menubar {
 	border-style: none;
-	padding: 4px;
+	padding: 0px;
 	-GtkWidget-window-dragging: true;
 	-GtkMenuBar-internal-padding: 1;
 	background-image: -gtk-gradient (linear,
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk.css b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk.css
index c916fc5a..6dd43210 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk.css
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk.css
@@ -394,4 +394,5 @@
 @import url("gtk-widgets-img.css");
 @import url("gtk-widgets.css");
 @import url("applications.css");
+@import url("mate-applications.css");
 
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css b/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css
new file mode 100755
index 00000000..a0955e75
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css
@@ -0,0 +1,245 @@
+/************
+ * Caja *
+ ************/
+
+
+.caja-desktop.caja-canvas-item {
+	color: @theme_base_color;
+	text-shadow: 1px 1px alpha (@theme_fg_color, 0.8);
+}
+
+.caja-desktop.caja-canvas-item:active,
+.caja-desktop.caja-canvas-item:prelight,
+.caja-desktop.caja-canvas-item:selected {
+	text-shadow: none;
+}
+
+
+.caja-desktop .entry {
+	background-image: none;
+	border-image: none;
+}
+
+/***************
+ * mate-panel *
+ ***************/
+
+.mate-panel-menu-bar,
+MatePanelApplet > GtkMenuBar.menubar,
+PanelToplevel,
+PanelWidget,
+PanelFrame,
+PanelAppletFrame,
+MatePanelAppletFrameDBus,
+MatePanelAppletContainer,
+MatePanelApplet {
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  left bottom,
+	                  from (@menubar_gradient_a),
+	                  color-stop (0.50, @menubar_gradient_b),
+	                  to (@menubar_gradient_c));
+	background-color: @theme_bg_color;
+	padding: 0px;
+	color: @theme_fg_color;
+	text-shadow: none;
+}
+
+/* set selected menubar button */
+PanelMenuBar.menubar .menuitem:hover {
+	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));
+}
+
+/* set selected menubar menuitem */
+PanelMenuBar.menubar .menu .menuitem:active:hover,
+PanelMenuBar.menubar .menu .menuitem:hover {
+	background-image: none;
+	color: @theme_selected_fg_color;
+	border-style: solid;
+	border-width: 0px;
+	border-radius: 3px;
+	border-color: alpha(@theme_selected_bg_color, 0.1);
+	padding: 3px 5px;
+}
+
+MatePanelApplet {
+	border-width: 0;
+}
+
+PanelSeparator {
+	border-width: 0;
+	background-image: none;
+	color: shade (@theme_bg_color, 0.75);
+	text-shadow: none;
+}
+
+/* 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,
+	                  left bottom,
+	                  from (@button_gradient_a),
+	                  color-stop (0.50, @button_gradient_b),
+	                  color-stop (0.50, @button_gradient_c),
+	                  to (@button_gradient_d));
+}
+
+MatePanelApplet .button:active:hover,
+MatePanelApplet .button:active {
+	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);
+}
+
+MatePanelApplet .button:hover {
+	border-style: solid;
+	background-image: linear-gradient(to bottom,
+	                                  @button_gradient_color_b,
+	                                  @button_gradient_color_a);
+}
+
+/*Wncklist */
+WnckTasklist .button {
+	padding: 0px;
+	border-radius: 3px;
+	border-width: 1px;
+	border-style: solid;
+	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));
+}
+
+WnckTasklist .button:active:hover,
+WnckTasklist .button:active {
+	border-style: solid;
+	background-color: transparent;
+	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);
+}
+
+WnckTasklist .button:hover {
+	border-style: solid;
+	background-color: transparent;
+	background-image: linear-gradient(to bottom,
+	                  @button_hover_gradient_c);
+}
+
+/* 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 {
+	background-image: none;
+	background-color: shade(@theme_selected_bg_color, 1.1);
+	color: @theme_text_color;
+	border-style: solid;
+	border-width: 1px;
+	border-radius: 3px;
+	border-image: url("assets/menu-border.svg") 2 / 2px stretch;
+	/*border-color: alpha(@theme_selected_bg_color, 0.1);*/
+}
+
+ClockBox,
+.mate-panel-menu-bar.menubar,
+MatePanelApplet > GtkMenuBar.menubar {
+	font: normal;
+}
+
+WnckPager {
+	background-image: none;
+	border-color: transparent;
+	background-color: shade(@theme_bg_color, 0.9);
+	text-shadow: none;
+}
+
+/* prelight of WnckPager */
+MatePanelApplet *:hover {
+	background-image: linear-gradient(to bottom,
+		shade (@theme_selected_bg_color, 2.86),
+		shade (@theme_selected_bg_color, 1.0));
+	background-color: @theme_base_color;
+}
+
+/* Classic icon style */
+/*.mate-panel-menu-bar {
+	-PanelMenuBar-icon-visible: true;
+}*/
+
+NaTrayApplet {
+	background-image: none;
+	background-color: @theme_bg_color;
+	padding: 0;
+	color: @theme_fg_color;
+	text-shadow: none;
+/*	-NaTrayApplet-icon-padding: 12;
+	-NaTrayApplet-icon-size: 16;*/
+}
+
+/*********
+ * Pluma *
+ *********/
+
+PlumaFloatingSlider .entry.not-found:focus {
+	border-image: url("img/border-error.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
+}
+
+/******************
+ * mate-terminal *
+ ******************/
+
+TerminalWindow .entry {
+    -TerminalWindow-background-darkness: 0.95;
+	background-color: @theme_base_color;
+	color: @theme_fg_color;
+}
diff --git a/desktop-themes/TraditionalOkTest/metacity-1/metacity-theme-1.xml b/desktop-themes/TraditionalOkTest/metacity-1/metacity-theme-1.xml
index b824497a..d414fd03 100644..100755
--- a/desktop-themes/TraditionalOkTest/metacity-1/metacity-theme-1.xml
+++ b/desktop-themes/TraditionalOkTest/metacity-1/metacity-theme-1.xml
@@ -340,16 +340,16 @@
 
 <!-- ::: TITLES ::: -->
 <draw_ops name="title_text">
-	<title color="shade/gtk:bg[SELECTED]/0.7" x="((3 `max` (width-title_width)) / 2)" y="(((height - title_height) / 2) `max` 0) + 1"/>
+	<!--<title color="shade/gtk:bg[SELECTED]/0.7" x="((3 `max` (width-title_width)) / 2)" y="(((height - title_height) / 2) `max` 0) + 1"/>
 	<title color="shade/gtk:bg[SELECTED]/0.7" x="((3 `max` (width-title_width)) / 2)+1" y="(((height - title_height) / 2) `max` 0)"/>
 	<title color="shade/gtk:bg[SELECTED]/0.7" x="((3 `max` (width-title_width)) / 2)-1" y="(((height - title_height) / 2) `max` 0)"/>
-	<title color="shade/gtk:bg[SELECTED]/0.7" x="((3 `max` (width-title_width)) / 2)" y="(((height - title_height) / 2) `max` 0)-1"/>
-	<title color="#FFFFFF" x="(3 `max` (width-title_width)) / 2" y="(((height - title_height) / 2) `max` 0)"/>
+	<title color="shade/gtk:bg[SELECTED]/0.7" x="((3 `max` (width-title_width)) / 2)" y="(((height - title_height) / 2) `max` 0)-1"/>-->
+	<title color="blend/gtk:fg[NORMAL]/gtk:text[NORMAL]/0.95" x="4 `max` (width-title_width)/2" y="0 `max` ((height-title_height)/2)"/>
 </draw_ops>
 
 <draw_ops name="title_text_unfocused">
 	<!--<title color="shade/gtk:bg[NORMAL]/1.07" x="5 `max` (width-title_width)/2+1" y="1 `max` ((height-title_height)/2)+1"/>-->
-	<title color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" x="4 `max` (width-title_width)/2" y="0 `max` ((height-title_height)/2)"/>
+	<title color="blend/gtk:fg[NORMAL]/gtk:text[NORMAL]/0.65" x="4 `max` (width-title_width)/2" y="0 `max` ((height-title_height)/2)"/>
 </draw_ops>
 
 <draw_ops name="title">
@@ -463,12 +463,12 @@
 
 	<!-- fill gradient -->
 	<gradient type="vertical" x="3" y="3" width="width-6" height="(height)/2-1">
-		<color value="shade/gtk:bg[NORMAL]/1.15"/>
-		<color value="shade/gtk:bg[NORMAL]/1.07"/>
+		<color value="shade/gtk:bg[NORMAL]/0.95"/>
+		<color value="shade/gtk:bg[NORMAL]/0.87"/>
 	</gradient>
 	<gradient type="vertical" x="3" y="(height)/2" width="width-6" height="(height)/2-2">
-		<color value="shade/gtk:bg[NORMAL]/1.05"/>
-		<color value="shade/gtk:bg[NORMAL]/0.97"/>
+		<color value="shade/gtk:bg[NORMAL]/0.85"/>
+		<color value="shade/gtk:bg[NORMAL]/0.77"/>
 	</gradient>
 
 	<!-- bottom border smooth effect -->