Merge lp:~3v1n0/ubuntu-themes/gtk-theme-colors-define into lp:ubuntu-themes

[Marco Trevisan (Treviño)]

Ambiance, Radiance: define theme_* colors based on ours

Some apps customizing their CSS might use them to override
the default values, so we need to provide a definition.

Example of affeted app is gitg (without defining @theme_fg/text_color's the commit message in log view would be white).

[Daniel van Vugt (vanvugt)]

Does this cover bug 1690966?

[Iain Lane (laney)]

couple of comments, feel free to land after resolving them

review: Needs Information

[Marco Trevisan (Treviño) (3v1n0)]

Daniel, no... I guess we want a proper solution for that.

[Marco Trevisan (Treviño) (3v1n0)]

Ok, updating as Laney requested

[lp:~3v1n0/ubuntu-themes/gtk-theme-colors-define]

546. By Marco Trevisan (Treviño) on 2017-05-16

Ambiance, Radiance: improve wording and fix Radiance copy-paste typo

=== modified file 'Ambiance/gtk-3.20/gtk-main.css'
--- Ambiance/gtk-3.20/gtk-main.css	2017-05-05 19:17:11 +0000
+++ Ambiance/gtk-3.20/gtk-main.css	2017-05-16 10:30:37 +0000
@@ -8,13 +8,71 @@
 @define-color tooltip_bg_color #000000;
 @define-color tooltip_fg_color #ffffff;
 
+@define-color active_shadow_color black;
+@define-color inactive_shadow_color alpha(black, 0.3);
+
+/** GTK NAMED COLORS: these might be reused by apps, keep in sync with Adwaita **/
+/*
+widget text/foreground color */
+@define-color theme_fg_color @fg_color;
+/*
+text color for entries, views and content in general */
+@define-color theme_text_color @fg_color;
+/*
+widget base background color */
+@define-color theme_bg_color @bg_color;
+/*
+text widgets and the like base background color */
+@define-color theme_base_color @base_color;
+/*
+base background color of selections */
+@define-color theme_selected_bg_color @selected_bg_color;
+/*
+text/foreground color of selections */
+@define-color theme_selected_fg_color @selected_fg_color;
+/*
+base background color of insensitive widgets */
 @define-color insensitive_bg_color shade(@bg_color, 0.95);
+/*
+text foreground color of insensitive widgets */
 @define-color insensitive_fg_color shade(@bg_color, 0.6);
-
+/*
+insensitive text widgets and the like base background color */
+@define-color insensitive_base_color @theme_base_color;
+/*
+widget text/foreground color on backdrop windows */
+@define-color theme_unfocused_fg_color @backdrop_fg_color;
+/*
+text color for entries, views and content in general on backdrop windows */
+@define-color theme_unfocused_text_color @backdrop_text_color;
+/*
+widget base background color on backdrop windows */
+@define-color theme_unfocused_bg_color @theme_bg_color;
+/*
+text widgets and the like base background color on backdrop windows */
+@define-color theme_unfocused_base_color @theme_base_color;
+/*
+base background color of selections on backdrop windows */
+@define-color theme_unfocused_selected_bg_color @backdrop_selected_bg_color;
+/*
+text/foreground color of selections on backdrop windows */
+@define-color theme_unfocused_selected_fg_color @backdrop_selected_fg_color;
+/*
+insensitive color on backdrop windows*/
+@define-color unfocused_insensitive_color @insensitive_fg_color;
+/*
+widgets main borders color */
 @define-color borders shade(@bg_color, 0.82);
+/*
+widgets main borders color on backdrop windows */
+@define-color unfocused_borders @borders;
+/*
+these are pretty self explanatory */
+@define-color warning_color #f57900;
+@define-color error_color #df382c;
+@define-color success_color #4e9a06;
 
-@define-color active_shadow_color black;
-@define-color inactive_shadow_color alpha(black, 0.3);
+/** Default theme colors definition end **/
 
 /* misc colors used by gtk+
  *
@@ -32,8 +90,6 @@
 @define-color error_fg_color rgb (235, 235, 235);
 @define-color error_bg_color rgb (223, 56, 44);
 @define-color link_color @selected_bg_color;
-@define-color success_color #4e9a06;
-@define-color error_color #df382c;
 
 /* theme common colors */
 @define-color button_text_shadow alpha(white, 0.4);
@@ -45,7 +101,6 @@
 
 @define-color backdrop_fg_color mix (@bg_color, @fg_color, 0.8);
 @define-color backdrop_text_color mix (@base_color, @text_color, 0.8);
-@define-color theme_unfocused_text_color @backdrop_text_color;
 @define-color backdrop_dark_fg_color mix (@dark_bg_color, @dark_fg_color, 0.75);
 /*@define-color backdrop_dark_bg_color mix (@dark_bg_color, @dark_fg_color, 0.75);*/
 @define-color backdrop_selected_bg_color shade (@bg_color, 0.92);

=== modified file 'Radiance/gtk-3.20/gtk-main.css'
--- Radiance/gtk-3.20/gtk-main.css	2017-05-05 19:17:11 +0000
+++ Radiance/gtk-3.20/gtk-main.css	2017-05-16 10:30:37 +0000
@@ -8,13 +8,69 @@
 @define-color tooltip_bg_color #000000;
 @define-color tooltip_fg_color #ffffff;
 
+@define-color active_shadow_color black;
+@define-color inactive_shadow_color alpha(black, 0.3);
+
+/** GTK NAMED COLORS: these might be reused by apps, keep in sync with Adwaita **/
+/*
+widget text/foreground color */
+@define-color theme_fg_color @fg_color;
+/*
+text color for entries, views and content in general */
+@define-color theme_text_color @fg_color;
+/*
+widget base background color */
+@define-color theme_bg_color @bg_color;
+/*
+text widgets and the like base background color */
+@define-color theme_base_color @base_color;
+/*
+base background color of selections */
+@define-color theme_selected_bg_color @selected_bg_color;
+/*
+text/foreground color of selections */
+@define-color theme_selected_fg_color @selected_fg_color;
+/*
+base background color of insensitive widgets */
 @define-color insensitive_bg_color shade(@bg_color, 0.95);
+/*
+text foreground color of insensitive widgets */
 @define-color insensitive_fg_color shade(@fg_color, 0.6);
-
+/*
+insensitive text widgets and the like base background color */
+@define-color insensitive_base_color @theme_base_color;
+/*
+widget text/foreground color on backdrop windows */
+@define-color theme_unfocused_fg_color @backdrop_fg_color;
+/*
+text color for entries, views and content in general on backdrop windows */
+@define-color theme_unfocused_text_color @backdrop_text_color;
+/*
+widget base background color on backdrop windows */
+@define-color theme_unfocused_bg_color @theme_bg_color;
+/*
+text widgets and the like base background color on backdrop windows */
+@define-color theme_unfocused_base_color @theme_base_color;
+/*
+base background color of selections on backdrop windows */
+@define-color theme_unfocused_selected_bg_color @backdrop_selected_bg_color;
+/*
+text/foreground color of selections on backdrop windows */
+@define-color theme_unfocused_selected_fg_color @backdrop_selected_fg_color;
+/*
+insensitive color on backdrop windows*/
+@define-color unfocused_insensitive_color @insensitive_fg_color;
+/*
+widgets main borders color */
 @define-color borders shade(@bg_color, 0.82);
-
-@define-color active_shadow_color black;
-@define-color inactive_shadow_color alpha(black, 0.3);
+/*
+widgets main borders color on backdrop windows */
+@define-color unfocused_borders @borders;
+/*
+these are pretty self explanatory */
+@define-color warning_color #f57900;
+@define-color error_color #df382c;
+@define-color success_color #4e9a06;
 
 /* misc colors used by gtk+
  *
@@ -33,8 +89,6 @@
 @define-color error_fg_color rgb (235, 235, 235);
 @define-color error_bg_color rgb (223, 56, 44);
 @define-color link_color @selected_bg_color;
-@define-color success_color #4e9a06;
-@define-color error_color #df382c;
 
 /* theme common colors */
 @define-color button_bg_color shade (@bg_color, 1.02); /*shade (#cdcdcd, 1.08);*/
@@ -45,7 +99,6 @@
 
 @define-color backdrop_fg_color mix (@bg_color, @fg_color, 0.8);
 @define-color backdrop_text_color mix (@base_color, @text_color, 0.8);
-@define-color theme_unfocused_text_color @backdrop_text_color;
 @define-color backdrop_dark_fg_color mix (@dark_bg_color, @dark_fg_color, 0.75);
 @define-color backdrop_selected_bg_color shade (@bg_color, 0.92);
 @define-color backdrop_selected_fg_color @fg_color;