Revert "TRaditionalOK GTK3: set titlebar bg color for dialog windows, some color corrections"

This reverts commit 36f6438947e038ac6df168da45f72428d19109ee.

2 files changed, 16 insertions, 35 deletions

diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-variant.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-variant.css
index edfbf965..c19bf98d 100755..100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-variant.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-variant.css
@@ -6,26 +6,18 @@
  * color scheme *
  ****************/
 
-@define-color base_color #babdb6;
-@define-color theme_base_color @base_color;
+@define-color theme_base_color #ffffff;
 
-@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_bg_color #edeceb;
+@define-color theme_fg_color #000000;
 
-@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_selected_bg_color #86abd9;
+@define-color theme_selected_fg_color #ffffff;
 
-@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_tooltip_bg_color #f5f5b5;
+@define-color theme_tooltip_fg_color #000000;
 
-@define-color text_color #000000;
-@define-color theme_text_color @text_color;
+@define-color theme_text_color #1a1a1a;
 
 @define-color link_color #0000ee;
 @define-color visited_link_color #551a8b;
@@ -45,8 +37,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 orange widgets in TraditionalOKTest. */
-@define-color core_color_b #888a85; /* Core color for gray widgets in TraditionalOKTest. */
+@define-color core_color_a #a4c2e8; /* Core color for blue widgets in Clearlooks-Phenix. */
+@define-color core_color_b #edeceb; /* Core color for gray widgets in Clearlooks-Phenix. */
 
 /********************************************
  * End of configuration for color variants. *
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
index 3ad7efa6..e8cb82fb 100755..100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
@@ -615,8 +615,8 @@ GtkComboBox.combobox-entry .button:hover,
 GtkColorChooserWidget #add-color-button:hover {
 	background-color: transparent;
 	background-image: linear-gradient(to bottom,
-	                  @button_hover_gradient_a 5%,
-	                  @button_hover_gradient_b 95%,
+	                  @button_hover_gradient_a 50%,
+	                  @button_hover_gradient_b 50%,
 	                  @button_hover_gradient_c);
 }
 
@@ -1133,6 +1133,8 @@ GtkTreeMenu .menuitem {
 	                  left top,
 	                  left bottom,
 	                  from (@menubar_menuitem_hover_gradient_a),
+	                  color-stop (0.50, @menubar_menuitem_hover_gradient_b),
+	                  color-stop (0.50, @menubar_menuitem_hover_gradient_c),
 	                  to (@menubar_menuitem_hover_gradient_d));
 }
 
@@ -1769,8 +1771,8 @@ GtkInfoBar:last-child,
 
 .titlebar {
 	background-image: linear-gradient(to bottom,
-	                  shade (@theme_selected_bg_color, 1.10),
-	                  @theme_selected_bg_color);
+	                  @theme_base_color,
+	                  @theme_bg_color);
 	background-color: transparent;
 	border-radius: 7px 7px 0px 0px;
 	border-bottom: 1px solid;
@@ -1799,18 +1801,6 @@ GtkInfoBar:last-child,
 	padding: 5px 5px 6px 5px;
 }
 
-.titlebar .titlebutton:hover {
-	background-image: linear-gradient(to bottom,
-	                  shade (@theme_selected_bg_color, 1.30),
-	                  shade (@theme_selected_bg_color, 1.05));
-	border-image: url("img/border.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
-	border-radius: 3px;
-	border-width: 1px 1px 2px 1px;
-	border-style: solid;
-	border-color: transparent;
-	padding: 5px 5px 6px 5px;
-}
-
 .window-frame {
 	border-width: 1px;
 	border-radius: 7px 7px 0 0;
@@ -1833,4 +1823,3 @@ GtkPopover > .toolbar,
 GtkPopover.osd > .toolbar .button {
 	background-color: transparent;
 }
-