Ubuntu theme

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

  1. gtk-theme-colors-define
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 546
Merged at revision: 544
Proposed branch: lp:~3v1n0/ubuntu-themes/gtk-theme-colors-define
Merge into: lp:ubuntu-themes
Diff against target: 190 lines (+121/-13)
2 files modified
Ambiance/gtk-3.20/gtk-main.css (+61/-6)
Radiance/gtk-3.20/gtk-main.css (+60/-7)
To merge this branch: bzr merge lp:~3v1n0/ubuntu-themes/gtk-theme-colors-define
Reviewer Review Type Date Requested Status
Iain Lane Needs Information
Review via email: mp+324091@code.launchpad.net

Commit message

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.

Description of the change

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

To post a comment you must log in.
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Does this cover bug 1690966?

Revision history for this message
Iain Lane (laney) wrote :

couple of comments, feel free to land after resolving them

review: Needs Information
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

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

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Ok, updating as Laney requested

lp:~3v1n0/ubuntu-themes/gtk-theme-colors-define updated
546. By Marco Trevisan (Treviño)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
8@define-color tooltip_bg_color #000000;8@define-color tooltip_bg_color #000000;
9@define-color tooltip_fg_color #ffffff;9@define-color tooltip_fg_color #ffffff;
1010
11@define-color active_shadow_color black;
12@define-color inactive_shadow_color alpha(black, 0.3);
13
14/** GTK NAMED COLORS: these might be reused by apps, keep in sync with Adwaita **/
15/*
16widget text/foreground color */
17@define-color theme_fg_color @fg_color;
18/*
19text color for entries, views and content in general */
20@define-color theme_text_color @fg_color;
21/*
22widget base background color */
23@define-color theme_bg_color @bg_color;
24/*
25text widgets and the like base background color */
26@define-color theme_base_color @base_color;
27/*
28base background color of selections */
29@define-color theme_selected_bg_color @selected_bg_color;
30/*
31text/foreground color of selections */
32@define-color theme_selected_fg_color @selected_fg_color;
33/*
34base background color of insensitive widgets */
11@define-color insensitive_bg_color shade(@bg_color, 0.95);35@define-color insensitive_bg_color shade(@bg_color, 0.95);
36/*
37text foreground color of insensitive widgets */
12@define-color insensitive_fg_color shade(@bg_color, 0.6);38@define-color insensitive_fg_color shade(@bg_color, 0.6);
1339/*
40insensitive text widgets and the like base background color */
41@define-color insensitive_base_color @theme_base_color;
42/*
43widget text/foreground color on backdrop windows */
44@define-color theme_unfocused_fg_color @backdrop_fg_color;
45/*
46text color for entries, views and content in general on backdrop windows */
47@define-color theme_unfocused_text_color @backdrop_text_color;
48/*
49widget base background color on backdrop windows */
50@define-color theme_unfocused_bg_color @theme_bg_color;
51/*
52text widgets and the like base background color on backdrop windows */
53@define-color theme_unfocused_base_color @theme_base_color;
54/*
55base background color of selections on backdrop windows */
56@define-color theme_unfocused_selected_bg_color @backdrop_selected_bg_color;
57/*
58text/foreground color of selections on backdrop windows */
59@define-color theme_unfocused_selected_fg_color @backdrop_selected_fg_color;
60/*
61insensitive color on backdrop windows*/
62@define-color unfocused_insensitive_color @insensitive_fg_color;
63/*
64widgets main borders color */
14@define-color borders shade(@bg_color, 0.82);65@define-color borders shade(@bg_color, 0.82);
66/*
67widgets main borders color on backdrop windows */
68@define-color unfocused_borders @borders;
69/*
70these are pretty self explanatory */
71@define-color warning_color #f57900;
72@define-color error_color #df382c;
73@define-color success_color #4e9a06;
1574
16@define-color active_shadow_color black;75/** Default theme colors definition end **/
17@define-color inactive_shadow_color alpha(black, 0.3);
1876
19/* misc colors used by gtk+77/* misc colors used by gtk+
20 *78 *
@@ -32,8 +90,6 @@
32@define-color error_fg_color rgb (235, 235, 235);90@define-color error_fg_color rgb (235, 235, 235);
33@define-color error_bg_color rgb (223, 56, 44);91@define-color error_bg_color rgb (223, 56, 44);
34@define-color link_color @selected_bg_color;92@define-color link_color @selected_bg_color;
35@define-color success_color #4e9a06;
36@define-color error_color #df382c;
3793
38/* theme common colors */94/* theme common colors */
39@define-color button_text_shadow alpha(white, 0.4);95@define-color button_text_shadow alpha(white, 0.4);
@@ -45,7 +101,6 @@
45101
46@define-color backdrop_fg_color mix (@bg_color, @fg_color, 0.8);102@define-color backdrop_fg_color mix (@bg_color, @fg_color, 0.8);
47@define-color backdrop_text_color mix (@base_color, @text_color, 0.8);103@define-color backdrop_text_color mix (@base_color, @text_color, 0.8);
48@define-color theme_unfocused_text_color @backdrop_text_color;
49@define-color backdrop_dark_fg_color mix (@dark_bg_color, @dark_fg_color, 0.75);104@define-color backdrop_dark_fg_color mix (@dark_bg_color, @dark_fg_color, 0.75);
50/*@define-color backdrop_dark_bg_color mix (@dark_bg_color, @dark_fg_color, 0.75);*/105/*@define-color backdrop_dark_bg_color mix (@dark_bg_color, @dark_fg_color, 0.75);*/
51@define-color backdrop_selected_bg_color shade (@bg_color, 0.92);106@define-color backdrop_selected_bg_color shade (@bg_color, 0.92);
52107
=== 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 @@
8@define-color tooltip_bg_color #000000;8@define-color tooltip_bg_color #000000;
9@define-color tooltip_fg_color #ffffff;9@define-color tooltip_fg_color #ffffff;
1010
11@define-color active_shadow_color black;
12@define-color inactive_shadow_color alpha(black, 0.3);
13
14/** GTK NAMED COLORS: these might be reused by apps, keep in sync with Adwaita **/
15/*
16widget text/foreground color */
17@define-color theme_fg_color @fg_color;
18/*
19text color for entries, views and content in general */
20@define-color theme_text_color @fg_color;
21/*
22widget base background color */
23@define-color theme_bg_color @bg_color;
24/*
25text widgets and the like base background color */
26@define-color theme_base_color @base_color;
27/*
28base background color of selections */
29@define-color theme_selected_bg_color @selected_bg_color;
30/*
31text/foreground color of selections */
32@define-color theme_selected_fg_color @selected_fg_color;
33/*
34base background color of insensitive widgets */
11@define-color insensitive_bg_color shade(@bg_color, 0.95);35@define-color insensitive_bg_color shade(@bg_color, 0.95);
36/*
37text foreground color of insensitive widgets */
12@define-color insensitive_fg_color shade(@fg_color, 0.6);38@define-color insensitive_fg_color shade(@fg_color, 0.6);
1339/*
40insensitive text widgets and the like base background color */
41@define-color insensitive_base_color @theme_base_color;
42/*
43widget text/foreground color on backdrop windows */
44@define-color theme_unfocused_fg_color @backdrop_fg_color;
45/*
46text color for entries, views and content in general on backdrop windows */
47@define-color theme_unfocused_text_color @backdrop_text_color;
48/*
49widget base background color on backdrop windows */
50@define-color theme_unfocused_bg_color @theme_bg_color;
51/*
52text widgets and the like base background color on backdrop windows */
53@define-color theme_unfocused_base_color @theme_base_color;
54/*
55base background color of selections on backdrop windows */
56@define-color theme_unfocused_selected_bg_color @backdrop_selected_bg_color;
57/*
58text/foreground color of selections on backdrop windows */
59@define-color theme_unfocused_selected_fg_color @backdrop_selected_fg_color;
60/*
61insensitive color on backdrop windows*/
62@define-color unfocused_insensitive_color @insensitive_fg_color;
63/*
64widgets main borders color */
14@define-color borders shade(@bg_color, 0.82);65@define-color borders shade(@bg_color, 0.82);
1566/*
16@define-color active_shadow_color black;67widgets main borders color on backdrop windows */
17@define-color inactive_shadow_color alpha(black, 0.3);68@define-color unfocused_borders @borders;
69/*
70these are pretty self explanatory */
71@define-color warning_color #f57900;
72@define-color error_color #df382c;
73@define-color success_color #4e9a06;
1874
19/* misc colors used by gtk+75/* misc colors used by gtk+
20 *76 *
@@ -33,8 +89,6 @@
33@define-color error_fg_color rgb (235, 235, 235);89@define-color error_fg_color rgb (235, 235, 235);
34@define-color error_bg_color rgb (223, 56, 44);90@define-color error_bg_color rgb (223, 56, 44);
35@define-color link_color @selected_bg_color;91@define-color link_color @selected_bg_color;
36@define-color success_color #4e9a06;
37@define-color error_color #df382c;
3892
39/* theme common colors */93/* theme common colors */
40@define-color button_bg_color shade (@bg_color, 1.02); /*shade (#cdcdcd, 1.08);*/94@define-color button_bg_color shade (@bg_color, 1.02); /*shade (#cdcdcd, 1.08);*/
@@ -45,7 +99,6 @@
4599
46@define-color backdrop_fg_color mix (@bg_color, @fg_color, 0.8);100@define-color backdrop_fg_color mix (@bg_color, @fg_color, 0.8);
47@define-color backdrop_text_color mix (@base_color, @text_color, 0.8);101@define-color backdrop_text_color mix (@base_color, @text_color, 0.8);
48@define-color theme_unfocused_text_color @backdrop_text_color;
49@define-color backdrop_dark_fg_color mix (@dark_bg_color, @dark_fg_color, 0.75);102@define-color backdrop_dark_fg_color mix (@dark_bg_color, @dark_fg_color, 0.75);
50@define-color backdrop_selected_bg_color shade (@bg_color, 0.92);103@define-color backdrop_selected_bg_color shade (@bg_color, 0.92);
51@define-color backdrop_selected_fg_color @fg_color;104@define-color backdrop_selected_fg_color @fg_color;

Subscribers

People subscribed via source and target branches