TraditionaGreen GTK3: adjust titlebar in dialog windows, some color correction

2 files changed, 36 insertions, 16 deletions

diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-variant.css b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-variant.css
index 41a8a7f2..3411d51a 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-variant.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-variant.css
@@ -6,18 +6,26 @@
  * color scheme *
  ****************/
 
-@define-color theme_base_color #ffffff;
-
-@define-color theme_bg_color #edeceb;
-@define-color theme_fg_color #000000;
-
-@define-color theme_selected_bg_color #B4BBA3;
-@define-color theme_selected_fg_color #42453E;
-
-@define-color theme_tooltip_bg_color #EAF5B5;
-@define-color theme_tooltip_fg_color #000000;
-
-@define-color theme_text_color #1a1a1a;
+@define-color base_color #ffffff;
+@define-color theme_base_color @base_color;
+
+@define-color bg_color #edeceb;
+@define-color fg_color #000000;
+@define-color theme_bg_color @bg_color;
+@define-color theme_fg_color @fg_color;
+
+@define-color selected_bg_color #B4BBA3;
+@define-color selected_fg_color #42453E;
+@define-color theme_selected_bg_color @selected_bg_color;
+@define-color theme_selected_fg_color @selected_fg_color;
+
+@define-color tooltip_bg_color #EAF5B5;
+@define-color tooltip_fg_color #000000;
+@define-color theme_tooltip_bg_color @tooltip_bg_color;
+@define-color theme_tooltip_fg_color @tooltip_fg_color;
+
+@define-color text_color #1a1a1a;
+@define-color theme_text_color @text_color;
 
 @define-color link_color #0000ee;
 @define-color visited_link_color #551a8b;
diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
index e8cb82fb..255fe7ae 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
@@ -1771,12 +1771,12 @@ GtkInfoBar:last-child,
 
 .titlebar {
 	background-image: linear-gradient(to bottom,
-	                  @theme_base_color,
-	                  @theme_bg_color);
+	                  shade (@theme_selected_bg_color, 1.10),
+	                  @theme_selected_bg_color);
 	background-color: transparent;
 	border-radius: 7px 7px 0px 0px;
-	border-bottom: 1px solid;
-	border-color: shade(@border_color, 1.30);
+/*	border-bottom: 1px solid;
+	border-color: shade(@theme_fg_color, 1.30);*/
 }
 
 .titlebar > * {
@@ -1801,6 +1801,18 @@ 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;