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

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 618
Merged at revision: 617
Proposed branch: lp:~3v1n0/ubuntu-themes/theme-colors-definitions
Merge into: lp:ubuntu-themes
Diff against target: 701 lines (+213/-226)
6 files modified
Ambiance/gtk-3.20/gtk-main.css (+5/-84)
Ambiance/gtk-3.20/gtk-widgets.css (+12/-13)
Ambiance/gtk-3.20/public-colors.css (+88/-16)
Radiance/gtk-3.20/gtk-main.css (+6/-83)
Radiance/gtk-3.20/gtk-widgets.css (+13/-14)
Radiance/gtk-3.20/public-colors.css (+89/-16)
To merge this branch: bzr merge lp:~3v1n0/ubuntu-themes/theme-colors-definitions
Reviewer Review Type Date Requested Status
Ubuntu Artwork Packagers Pending
Review via email: mp+342965@code.launchpad.net

Commit message

Ambiance, Radiance: add missing global color definitions

To post a comment you must log in.
618. By Marco Trevisan (Treviño)

Ambiance, Radiance: move gtk colors definitions in public-colors.css

Remove wrong definitions that were overriding the ones we wanted

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ambiance/gtk-3.20/gtk-main.css'
2--- Ambiance/gtk-3.20/gtk-main.css 2018-03-22 07:12:28 +0000
3+++ Ambiance/gtk-3.20/gtk-main.css 2018-04-10 21:51:21 +0000
4@@ -1,106 +1,28 @@
5 /*default color scheme */
6 @define-color bg_color #f2f1f0;
7 @define-color fg_color #4c4c4c;
8+@define-color dark_bg_color #3c3b37;
9+@define-color dark_fg_color #dfdbd2;
10 @define-color base_color #ffffff;
11 @define-color text_color #3C3C3C;
12 @define-color selected_bg_color #f07746;
13 @define-color selected_fg_color #ffffff;
14 @define-color tooltip_bg_color #000000;
15 @define-color tooltip_fg_color #ffffff;
16+@define-color backdrop_fg_color mix (@bg_color, @fg_color, 0.8);
17+@define-color backdrop_text_color mix (@base_color, @text_color, 0.8);
18
19 @define-color active_shadow_color black;
20 @define-color inactive_shadow_color alpha(black, 0.3);
21
22-/** GTK NAMED COLORS: these might be reused by apps, keep in sync with Adwaita **/
23-/*
24-widget text/foreground color */
25-@define-color theme_fg_color @fg_color;
26-/*
27-text color for entries, views and content in general */
28-@define-color theme_text_color @fg_color;
29-/*
30-widget base background color */
31-@define-color theme_bg_color @bg_color;
32-/*
33-text widgets and the like base background color */
34-@define-color theme_base_color @base_color;
35-/*
36-base background color of selections */
37-@define-color theme_selected_bg_color @selected_bg_color;
38-/*
39-text/foreground color of selections */
40-@define-color theme_selected_fg_color @selected_fg_color;
41-/*
42-base background color of insensitive widgets */
43-@define-color insensitive_bg_color shade(@bg_color, 0.95);
44-/*
45-text foreground color of insensitive widgets */
46-@define-color insensitive_fg_color shade(@bg_color, 0.6);
47-/*
48-insensitive text widgets and the like base background color */
49-@define-color insensitive_base_color @theme_base_color;
50-/*
51-widget text/foreground color on backdrop windows */
52-@define-color theme_unfocused_fg_color @backdrop_fg_color;
53-/*
54-text color for entries, views and content in general on backdrop windows */
55-@define-color theme_unfocused_text_color @backdrop_text_color;
56-/*
57-widget base background color on backdrop windows */
58-@define-color theme_unfocused_bg_color @theme_bg_color;
59-/*
60-text widgets and the like base background color on backdrop windows */
61-@define-color theme_unfocused_base_color @theme_base_color;
62-/*
63-base background color of selections on backdrop windows */
64-@define-color theme_unfocused_selected_bg_color @backdrop_selected_bg_color;
65-/*
66-text/foreground color of selections on backdrop windows */
67-@define-color theme_unfocused_selected_fg_color @backdrop_selected_fg_color;
68-/*
69-insensitive color on backdrop windows*/
70-@define-color unfocused_insensitive_color @insensitive_fg_color;
71-/*
72-widgets main borders color */
73-@define-color borders shade(@bg_color, 0.82);
74-/*
75-widgets main borders color on backdrop windows */
76-@define-color unfocused_borders @borders;
77-/*
78-these are pretty self explanatory */
79-@define-color warning_color #eca918;
80-@define-color error_color #df382c;
81-@define-color success_color #38b44a;
82-
83-/** Default theme colors definition end **/
84-
85-/* misc colors used by gtk+
86- *
87- * Gtk doesn't currently expand color variables for style properties. Thus,
88- * gtk-widgets.css uses literal color names, but includes a comment containing
89- * the name of the variable. Please remember to change values there as well
90- * when changing one of the variables below.
91- */
92-@define-color info_fg_color rgb (181, 171, 156);
93-@define-color info_bg_color rgb (252, 252, 189);
94-@define-color warning_fg_color rgb (173, 120, 41);
95-@define-color warning_bg_color rgb (250, 173, 61);
96-@define-color question_fg_color rgb (97, 122, 214);
97-@define-color question_bg_color rgb (138, 173, 212);
98-@define-color error_fg_color rgb (235, 235, 235);
99-@define-color error_bg_color rgb (223, 56, 44);
100-@define-color link_color #007aa6;
101+@import url("public-colors.css");
102
103 /* theme common colors */
104 @define-color button_text_shadow alpha(white, 0.4);
105 @define-color button_bg_color shade (@bg_color, 1.02); /*shade (#cdcdcd, 1.08);*/
106 @define-color notebook_button_bg_color shade (@bg_color, 1.02);
107 @define-color button_insensitive_bg_color mix (@button_bg_color, @bg_color, 0.6);
108-@define-color dark_bg_color #3c3b37;
109-@define-color dark_fg_color #dfdbd2;
110
111-@define-color backdrop_fg_color mix (@bg_color, @fg_color, 0.8);
112-@define-color backdrop_text_color mix (@base_color, @text_color, 0.8);
113 @define-color backdrop_dark_fg_color mix (@dark_bg_color, @dark_fg_color, 0.75);
114 /*@define-color backdrop_dark_bg_color mix (@dark_bg_color, @dark_fg_color, 0.75);*/
115 @define-color backdrop_selected_bg_color shade (@bg_color, 0.92);
116@@ -149,4 +71,3 @@
117 @import url("apps/software-center.css");
118 @import url("apps/calendar.css");
119 @import url("apps/libreoffice.css");
120-@import url("public-colors.css");
121
122=== modified file 'Ambiance/gtk-3.20/gtk-widgets.css'
123--- Ambiance/gtk-3.20/gtk-widgets.css 2018-03-28 06:27:00 +0000
124+++ Ambiance/gtk-3.20/gtk-widgets.css 2018-04-10 21:51:21 +0000
125@@ -273,7 +273,7 @@
126 border-radius: 0;
127 border-image-width: 10px 0 10px 0;
128 border-width: 1px 0 1px 0;
129- box-shadow: inset -1px 0 shade (@bg_color, 0.84);
130+ box-shadow: inset -1px 0 @borders;
131 }
132
133 .linked entry:dir(rtl),
134@@ -283,7 +283,7 @@
135 .horizontal.linked button:dir(rtl),
136 .horizontal.linked combobox box.linked button:dir(rtl),
137 combobox entry + box.linked button:dir(rtl) {
138- box-shadow: inset 1px 0 shade (@bg_color, 0.84);
139+ box-shadow: inset 1px 0 @borders;
140 }
141
142 .linked entry:first-child,
143@@ -374,7 +374,7 @@
144 border-radius: 0;
145 border-image-width: 0 12px 0 12px;
146 border-width: 0 1px 0 1px;
147- box-shadow: inset 0 1px shade (@bg_color, 0.84);
148+ box-shadow: inset 0 1px @borders;
149 }
150
151 .vertical.linked entry:first-child,
152@@ -552,7 +552,7 @@
153 }
154
155 .linked.vertical > button:not(:last-child) {
156- box-shadow: inset 0 -1px 0 0 shade (@bg_color, 0.84);
157+ box-shadow: inset 0 -1px 0 0 @borders;
158 }
159
160 .linked.vertical > button:first-child:not(:last-child) {
161@@ -1485,7 +1485,7 @@
162
163 paned separator {
164 background-color: transparent;
165- border-color: shade (@bg_color, 0.84);
166+ border-color: @borders;
167 }
168
169 /************
170@@ -2017,7 +2017,7 @@
171 *******************/
172 .ubuntu-online-accounts.frame,
173 scrolledwindow.frame {
174- border-top-color: shade (@bg_color, 0.84);
175+ border-top-color: @borders;
176 border-right-color: shade (@bg_color, 0.76);
177 border-bottom-color: shade (@bg_color, 0.86);
178 border-left-color: shade (@bg_color, 0.76);
179@@ -2441,7 +2441,7 @@
180 border-radius: 0;
181 border-image-width: 0 12px 0 12px;
182 border-width: 0 1px 0 1px;
183- box-shadow: inset 0 1px shade (@bg_color, 0.84);
184+ box-shadow: inset 0 1px @borders;
185 }
186
187 /***********
188@@ -2577,7 +2577,7 @@
189 decoration {
190 margin: 10px;
191 border-radius: 6px 6px 0 0;
192- box-shadow: 1px 5px 13px alpha(@active_shadow_color, 0.85);
193+ box-shadow: 1px 5px 13px @wm_shadow;
194 }
195
196 decoration:backdrop,
197@@ -2654,7 +2654,7 @@
198 headerbar,
199 UnityDecoration .top {
200 min-height: 26px;
201- border: 1px solid rgba (0, 3, 5, 0.03); /* shade (@dark_bg_color, 1.04) - shade (@dark_bg_color, 1.5) */
202+ border: 1px solid rgba (0, 3, 5, 0.03); /* @wm_bg_b - @wm_bg_a */
203 padding: 1px 6px 1px 6px;
204
205 box-shadow: inset 0 0 transparent, inset 0 0 transparent,
206@@ -2663,10 +2663,9 @@
207 background-color: transparent;
208 background-clip: border-box;
209 background-image: -gtk-gradient (linear, left top, left bottom,
210- from (shade (@dark_bg_color, 1.5)),
211- to (shade (@dark_bg_color, 1.04)));
212+ from (@wm_bg_a), to (@wm_bg_b));
213
214- color: @dark_fg_color;
215+ color: @wm_title;
216 text-shadow: 1px 0 #333, -1px 0 #333, 0 1px #333, 0 -1px #333;
217 }
218
219@@ -2897,7 +2896,7 @@
220 border-width: 1px 0 1px 0;
221 border-radius: 0;
222
223- color: @dark_fg_color;
224+ color: @wm_title;
225 text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
226
227 box-shadow: inset 0 1px shade (@dark_bg_color, 0.94);
228
229=== modified file 'Ambiance/gtk-3.20/public-colors.css'
230--- Ambiance/gtk-3.20/public-colors.css 2016-08-01 12:10:11 +0000
231+++ Ambiance/gtk-3.20/public-colors.css 2018-04-10 21:51:21 +0000
232@@ -1,23 +1,95 @@
233+/** GTK NAMED COLORS: these might be reused by apps, keep in sync with Adwaita **/
234 /*
235- * Some applications depend on these named colors.
236- */
237-
238+widget text/foreground color */
239 @define-color theme_fg_color @fg_color;
240+/*
241+text color for entries, views and content in general */
242+@define-color theme_text_color @fg_color;
243+/*
244+widget base background color */
245 @define-color theme_bg_color @bg_color;
246+/*
247+text widgets and the like base background color */
248 @define-color theme_base_color @base_color;
249+/*
250+base background color of selections */
251 @define-color theme_selected_bg_color @selected_bg_color;
252+/*
253+text/foreground color of selections */
254 @define-color theme_selected_fg_color @selected_fg_color;
255-@define-color insensitive_bg_color @bg_color;
256-@define-color insensitive_fg_color @fg_color;
257-@define-color insensitive_base_color @base_color;
258+/*
259+base background color of insensitive widgets */
260+@define-color insensitive_bg_color shade(@bg_color, 0.95);
261+/*
262+text foreground color of insensitive widgets */
263+@define-color insensitive_fg_color shade(@bg_color, 0.6);
264+/*
265+insensitive text widgets and the like base background color */
266+@define-color insensitive_base_color @theme_base_color;
267+/*
268+widget text/foreground color on backdrop windows */
269 @define-color theme_unfocused_fg_color @backdrop_fg_color;
270-@define-color theme_unfocused_bg_color @bg_color;
271-@define-color theme_unfocused_base_color @base_color;
272-@define-color theme_unfocused_selected_bg_color @selected_bg_color;
273-@define-color theme_unfocused_selected_fg_color @selected_fg_color;
274-@define-color borders shade(@bg_color, 0.82);
275-@define-color unfocused_borders transparent;
276-
277-@define-color warning_color @warning_fg_color;
278-@define-color error_color @error_fg_color;
279-@define-color success_color @success_color;
280+/*
281+text color for entries, views and content in general on backdrop windows */
282+@define-color theme_unfocused_text_color @backdrop_text_color;
283+/*
284+widget base background color on backdrop windows */
285+@define-color theme_unfocused_bg_color @theme_bg_color;
286+/*
287+text widgets and the like base background color on backdrop windows */
288+@define-color theme_unfocused_base_color @theme_base_color;
289+/*
290+base background color of selections on backdrop windows */
291+@define-color theme_unfocused_selected_bg_color @backdrop_selected_bg_color;
292+/*
293+text/foreground color of selections on backdrop windows */
294+@define-color theme_unfocused_selected_fg_color @backdrop_selected_fg_color;
295+/*
296+insensitive color on backdrop windows*/
297+@define-color unfocused_insensitive_color @insensitive_fg_color;
298+/*
299+widgets main borders color */
300+@define-color borders shade(@bg_color, 0.84);
301+/*
302+widgets main borders color on backdrop windows */
303+@define-color unfocused_borders @borders;
304+/*
305+these are pretty self explanatory */
306+@define-color warning_color #eca918;
307+@define-color error_color #df382c;
308+@define-color success_color #38b44a;
309+
310+/*
311+these colors are exported for the window manager and shouldn't be used in applications,
312+read if you used those and something break with a version upgrade you're on your own... */
313+@define-color wm_title @dark_fg_color;
314+@define-color wm_unfocused_title #979797;
315+@define-color wm_highlight rgba(0, 0, 0, 0.1);
316+@define-color wm_borders_edge rgba(0, 0, 0, 0.1);
317+@define-color wm_bg_a shade (@dark_bg_color, 1.5);
318+@define-color wm_bg_b shade (@dark_bg_color, 1.04);
319+@define-color wm_shadow alpha(@active_shadow_color, 0.85);
320+@define-color wm_border alpha(black, 0.18);
321+@define-color wm_button_hover_color_a shade(#fdfdfd, 1.3);
322+@define-color wm_button_hover_color_b #fdfdfd;
323+@define-color wm_button_active_color_a shade(#fdfdfd, 0.85);
324+@define-color wm_button_active_color_b shade(#fdfdfd, 0.89);
325+@define-color wm_button_active_color_c shade(#fdfdfd, 0.9);
326+@define-color content_view_bg #ffffff;
327+
328+/* misc colors used by gtk+
329+ *
330+ * Gtk doesn't currently expand color variables for style properties. Thus,
331+ * gtk-widgets.css uses literal color names, but includes a comment containing
332+ * the name of the variable. Please remember to change values there as well
333+ * when changing one of the variables below.
334+ */
335+@define-color info_fg_color rgb (181, 171, 156);
336+@define-color info_bg_color rgb (252, 252, 189);
337+@define-color warning_fg_color rgb (173, 120, 41);
338+@define-color warning_bg_color rgb (250, 173, 61);
339+@define-color question_fg_color rgb (97, 122, 214);
340+@define-color question_bg_color rgb (138, 173, 212);
341+@define-color error_fg_color rgb (235, 235, 235);
342+@define-color error_bg_color rgb (223, 56, 44);
343+@define-color link_color #007aa6;
344
345=== modified file 'Radiance/gtk-3.20/gtk-main.css'
346--- Radiance/gtk-3.20/gtk-main.css 2018-03-22 07:18:04 +0000
347+++ Radiance/gtk-3.20/gtk-main.css 2018-04-10 21:51:21 +0000
348@@ -1,104 +1,27 @@
349 /*default color scheme */
350 @define-color bg_color #f2f1f0;
351 @define-color fg_color #4c4c4c;
352+@define-color dark_bg_color #dfd7cf;
353+@define-color dark_fg_color @fg_color;
354 @define-color base_color #ffffff;
355 @define-color text_color #3C3C3C;
356 @define-color selected_bg_color #f07746;
357 @define-color selected_fg_color #ffffff;
358 @define-color tooltip_bg_color #000000;
359 @define-color tooltip_fg_color #ffffff;
360+@define-color backdrop_fg_color mix (@bg_color, @fg_color, 0.8);
361+@define-color backdrop_text_color mix (@base_color, @text_color, 0.8);
362
363 @define-color active_shadow_color black;
364 @define-color inactive_shadow_color alpha(black, 0.3);
365
366-/** GTK NAMED COLORS: these might be reused by apps, keep in sync with Adwaita **/
367-/*
368-widget text/foreground color */
369-@define-color theme_fg_color @fg_color;
370-/*
371-text color for entries, views and content in general */
372-@define-color theme_text_color @fg_color;
373-/*
374-widget base background color */
375-@define-color theme_bg_color @bg_color;
376-/*
377-text widgets and the like base background color */
378-@define-color theme_base_color @base_color;
379-/*
380-base background color of selections */
381-@define-color theme_selected_bg_color @selected_bg_color;
382-/*
383-text/foreground color of selections */
384-@define-color theme_selected_fg_color @selected_fg_color;
385-/*
386-base background color of insensitive widgets */
387-@define-color insensitive_bg_color shade(@bg_color, 0.95);
388-/*
389-text foreground color of insensitive widgets */
390-@define-color insensitive_fg_color shade(@fg_color, 0.6);
391-/*
392-insensitive text widgets and the like base background color */
393-@define-color insensitive_base_color @theme_base_color;
394-/*
395-widget text/foreground color on backdrop windows */
396-@define-color theme_unfocused_fg_color @backdrop_fg_color;
397-/*
398-text color for entries, views and content in general on backdrop windows */
399-@define-color theme_unfocused_text_color @backdrop_text_color;
400-/*
401-widget base background color on backdrop windows */
402-@define-color theme_unfocused_bg_color @theme_bg_color;
403-/*
404-text widgets and the like base background color on backdrop windows */
405-@define-color theme_unfocused_base_color @theme_base_color;
406-/*
407-base background color of selections on backdrop windows */
408-@define-color theme_unfocused_selected_bg_color @backdrop_selected_bg_color;
409-/*
410-text/foreground color of selections on backdrop windows */
411-@define-color theme_unfocused_selected_fg_color @backdrop_selected_fg_color;
412-/*
413-insensitive color on backdrop windows*/
414-@define-color unfocused_insensitive_color @insensitive_fg_color;
415-/*
416-widgets main borders color */
417-@define-color borders shade(@bg_color, 0.82);
418-/*
419-widgets main borders color on backdrop windows */
420-@define-color unfocused_borders @borders;
421-/*
422-these are pretty self explanatory */
423-@define-color warning_color #eca918;
424-@define-color error_color #df382c;
425-@define-color success_color #38b44a;
426-
427-/* misc colors used by gtk+
428- *
429- * Gtk doesn't currently expand color variables for style properties. Thus,
430- * gtk-widgets.css uses literal color names, but includes a comment containing
431- * the name of the variable. Please remember to change values there as well
432- * when changing one of the variables below.
433- */
434-@define-color button_text_shadow alpha(white, 0.4);
435-@define-color info_fg_color rgb (181, 171, 156);
436-@define-color info_bg_color rgb (252, 252, 189);
437-@define-color warning_fg_color rgb (173, 120, 41);
438-@define-color warning_bg_color rgb (250, 173, 61);
439-@define-color question_fg_color rgb (97, 122, 214);
440-@define-color question_bg_color rgb (138, 173, 212);
441-@define-color error_fg_color rgb (235, 235, 235);
442-@define-color error_bg_color rgb (223, 56, 44);
443-@define-color link_color #007aa6;
444+@import url("public-colors.css");
445
446 /* theme common colors */
447 @define-color button_bg_color shade (@bg_color, 1.02); /*shade (#cdcdcd, 1.08);*/
448 @define-color notebook_button_bg_color shade (@bg_color, 1.02);
449 @define-color button_insensitive_bg_color mix (@button_bg_color, @bg_color, 0.6);
450-@define-color dark_bg_color #dfd7cf;
451-@define-color dark_fg_color @fg_color;
452
453-@define-color backdrop_fg_color mix (@bg_color, @fg_color, 0.8);
454-@define-color backdrop_text_color mix (@base_color, @text_color, 0.8);
455 @define-color backdrop_dark_fg_color mix (@dark_bg_color, @dark_fg_color, 0.75);
456 @define-color backdrop_selected_bg_color shade (@bg_color, 0.92);
457 @define-color backdrop_selected_fg_color @fg_color;
458@@ -146,9 +69,9 @@
459 @import url("apps/mozilla.css");
460 @import url("apps/gnome-panel.css");
461 @import url("apps/gnome-boxes.css");
462+@import url("apps/gnome-builder.css");
463 @import url("apps/gnome-flashback.css");
464 @import url("apps/gnome-terminal.css");
465 @import url("apps/software-center.css");
466 @import url("apps/calendar.css");
467 @import url("apps/libreoffice.css");
468-@import url("public-colors.css");
469
470=== modified file 'Radiance/gtk-3.20/gtk-widgets.css'
471--- Radiance/gtk-3.20/gtk-widgets.css 2018-03-28 06:27:00 +0000
472+++ Radiance/gtk-3.20/gtk-widgets.css 2018-04-10 21:51:21 +0000
473@@ -274,7 +274,7 @@
474 border-radius: 0;
475 border-image-width: 10px 0 10px 0;
476 border-width: 1px 0 1px 0;
477- box-shadow: inset -1px 0 shade (@bg_color, 0.84);
478+ box-shadow: inset -1px 0 @borders;
479 }
480
481 .linked entry:dir(rtl),
482@@ -284,7 +284,7 @@
483 .horizontal.linked button:dir(rtl),
484 .horizontal.linked combobox box.linked button:dir(rtl),
485 combobox entry + box.linked button:dir(rtl) {
486- box-shadow: inset 1px 0 shade (@bg_color, 0.84);
487+ box-shadow: inset 1px 0 @borders;
488 }
489
490 .linked entry:first-child,
491@@ -375,7 +375,7 @@
492 border-radius: 0;
493 border-image-width: 0 12px 0 12px;
494 border-width: 0 1px 0 1px;
495- box-shadow: inset 0 1px shade (@bg_color, 0.84);
496+ box-shadow: inset 0 1px @borders;
497 }
498
499 .vertical.linked entry:first-child,
500@@ -547,7 +547,7 @@
501 }
502
503 .linked.vertical > button:not(:last-child) {
504- box-shadow: inset 0 -1px 0 0 shade (@bg_color, 0.84);
505+ box-shadow: inset 0 -1px 0 0 @borders;
506 }
507
508 .linked.vertical > button:first-child:not(:last-child) {
509@@ -1480,7 +1480,7 @@
510
511 paned separator {
512 background-color: transparent;
513- border-color: shade (@bg_color, 0.84);
514+ border-color: @borders;
515 }
516
517 /************
518@@ -2012,7 +2012,7 @@
519 *******************/
520 .ubuntu-online-accounts.frame,
521 scrolledwindow.frame {
522- border-top-color: shade (@bg_color, 0.84);
523+ border-top-color: @borders;
524 border-right-color: shade (@bg_color, 0.76);
525 border-bottom-color: shade (@bg_color, 0.86);
526 border-left-color: shade (@bg_color, 0.76);
527@@ -2437,7 +2437,7 @@
528 border-radius: 0;
529 border-image-width: 0 12px 0 12px;
530 border-width: 0 1px 0 1px;
531- box-shadow: inset 0 1px shade (@bg_color, 0.84);
532+ box-shadow: inset 0 1px @borders;
533 }
534
535 /***********
536@@ -2573,7 +2573,7 @@
537 decoration {
538 margin: 10px;
539 border-radius: 6px 6px 0 0;
540- box-shadow: 1px 5px 13px alpha(@active_shadow_color, 0.85);
541+ box-shadow: 1px 5px 13px @wm_shadow;
542 }
543
544 decoration:backdrop,
545@@ -2650,7 +2650,7 @@
546 headerbar,
547 UnityDecoration .top {
548 min-height: 26px;
549- border: 1px solid rgba (85, 40, 0, 0.04); /* shade (@dark_bg_color) (shade (#edebe6, 1.06) */
550+ border: 1px solid rgba (85, 40, 0, 0.04); /* @wm_bg_b - @wm_bg_a */
551 padding: 1px 6px 1px 6px;
552
553 box-shadow: inset 0 0 transparent, inset 0 0 transparent,
554@@ -2659,10 +2659,9 @@
555 background-color: transparent;
556 background-clip: border-box;
557 background-image: -gtk-gradient (linear, left top, left bottom,
558- from (shade (#edebe6, 1.06)),
559- to (@dark_bg_color));
560+ from (@wm_bg_a), to (@wm_bg_b));
561
562- color: shade (@dark_bg_color, 0.4);
563+ color: @wm_title;
564 text-shadow: 1px 0 shade (@dark_bg_color, 1.06), -1px 0 shade (@dark_bg_color, 1.06),
565 0 1px shade (@dark_bg_color, 1.06), 0 -1px shade (@dark_bg_color, 1.06);
566 }
567@@ -2679,7 +2678,7 @@
568 box-shadow: inset 0 0 transparent, inset 0 0 transparent,
569 inset 0 1px shade (#edebe6, 0.97), inset 0 0 transparent;
570
571- color: #a39e9a;
572+ color: @wm_unfocused_title;
573 text-shadow: 1px 0 1px shade (@dark_bg_color, 1.08), -1px 0 1px shade (@dark_bg_color, 1.08),
574 0 1px 1px shade (@dark_bg_color, 1.08), 0 -1px 1px shade (@dark_bg_color, 1.08);
575 }
576@@ -2890,7 +2889,7 @@
577 border-width: 1px 0 1px 0;
578 border-radius: 0;
579
580- color: @dark_fg_color;
581+ color: @wm_title;
582 text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
583
584 box-shadow: inset 0 1px shade (@dark_bg_color, 0.94);
585
586=== modified file 'Radiance/gtk-3.20/public-colors.css'
587--- Radiance/gtk-3.20/public-colors.css 2016-08-04 16:31:00 +0000
588+++ Radiance/gtk-3.20/public-colors.css 2018-04-10 21:51:21 +0000
589@@ -1,23 +1,96 @@
590+/** GTK NAMED COLORS: these might be reused by apps, keep in sync with Adwaita **/
591 /*
592- * Some applications depend on these named colors.
593- */
594-
595+widget text/foreground color */
596 @define-color theme_fg_color @fg_color;
597+/*
598+text color for entries, views and content in general */
599+@define-color theme_text_color @fg_color;
600+/*
601+widget base background color */
602 @define-color theme_bg_color @bg_color;
603+/*
604+text widgets and the like base background color */
605 @define-color theme_base_color @base_color;
606+/*
607+base background color of selections */
608 @define-color theme_selected_bg_color @selected_bg_color;
609+/*
610+text/foreground color of selections */
611 @define-color theme_selected_fg_color @selected_fg_color;
612-@define-color insensitive_bg_color @bg_color;
613-@define-color insensitive_fg_color @fg_color;
614-@define-color insensitive_base_color @base_color;
615+/*
616+base background color of insensitive widgets */
617+@define-color insensitive_bg_color shade(@bg_color, 0.95);
618+/*
619+text foreground color of insensitive widgets */
620+@define-color insensitive_fg_color shade(@fg_color, 0.6);
621+/*
622+insensitive text widgets and the like base background color */
623+@define-color insensitive_base_color @theme_base_color;
624+/*
625+widget text/foreground color on backdrop windows */
626 @define-color theme_unfocused_fg_color @backdrop_fg_color;
627-@define-color theme_unfocused_bg_color @bg_color;
628-@define-color theme_unfocused_base_color @base_color;
629-@define-color theme_unfocused_selected_bg_color @selected_bg_color;
630-@define-color theme_unfocused_selected_fg_color @selected_fg_color;
631-@define-color borders shade(@bg_color, 0.82);
632-@define-color unfocused_borders transparent;
633-
634-@define-color warning_color @warning_fg_color;
635-@define-color error_color @error_fg_color;
636-@define-color success_color @success_color;
637+/*
638+text color for entries, views and content in general on backdrop windows */
639+@define-color theme_unfocused_text_color @backdrop_text_color;
640+/*
641+widget base background color on backdrop windows */
642+@define-color theme_unfocused_bg_color @theme_bg_color;
643+/*
644+text widgets and the like base background color on backdrop windows */
645+@define-color theme_unfocused_base_color @theme_base_color;
646+/*
647+base background color of selections on backdrop windows */
648+@define-color theme_unfocused_selected_bg_color @backdrop_selected_bg_color;
649+/*
650+text/foreground color of selections on backdrop windows */
651+@define-color theme_unfocused_selected_fg_color @backdrop_selected_fg_color;
652+/*
653+insensitive color on backdrop windows*/
654+@define-color unfocused_insensitive_color @insensitive_fg_color;
655+/*
656+widgets main borders color */
657+@define-color borders shade(@bg_color, 0.84);
658+/*
659+widgets main borders color on backdrop windows */
660+@define-color unfocused_borders @borders;
661+/*
662+these are pretty self explanatory */
663+@define-color warning_color #eca918;
664+@define-color error_color #df382c;
665+@define-color success_color #38b44a;
666+
667+/*
668+these colors are exported for the window manager and shouldn't be used in applications,
669+read if you used those and something break with a version upgrade you're on your own... */
670+@define-color wm_title shade (@dark_bg_color, 0.4);
671+@define-color wm_unfocused_title #a39e9a;
672+@define-color wm_highlight rgba(0, 0, 0, 0.1);
673+@define-color wm_borders_edge rgba(0, 0, 0, 0.1);
674+@define-color wm_bg_a shade (#edebe6, 1.06);
675+@define-color wm_bg_b @dark_bg_color;
676+@define-color wm_shadow alpha(@active_shadow_color, 0.85);
677+@define-color wm_border alpha(black, 0.18);
678+@define-color wm_button_hover_color_a shade(#fdfdfd, 1.3);
679+@define-color wm_button_hover_color_b #fdfdfd;
680+@define-color wm_button_active_color_a shade(#fdfdfd, 0.85);
681+@define-color wm_button_active_color_b shade(#fdfdfd, 0.89);
682+@define-color wm_button_active_color_c shade(#fdfdfd, 0.9);
683+@define-color content_view_bg #ffffff;
684+
685+/* misc colors used by gtk+
686+ *
687+ * Gtk doesn't currently expand color variables for style properties. Thus,
688+ * gtk-widgets.css uses literal color names, but includes a comment containing
689+ * the name of the variable. Please remember to change values there as well
690+ * when changing one of the variables below.
691+ */
692+@define-color button_text_shadow alpha(white, 0.4);
693+@define-color info_fg_color rgb (181, 171, 156);
694+@define-color info_bg_color rgb (252, 252, 189);
695+@define-color warning_fg_color rgb (173, 120, 41);
696+@define-color warning_bg_color rgb (250, 173, 61);
697+@define-color question_fg_color rgb (97, 122, 214);
698+@define-color question_bg_color rgb (138, 173, 212);
699+@define-color error_fg_color rgb (235, 235, 235);
700+@define-color error_bg_color rgb (223, 56, 44);
701+@define-color link_color #007aa6;

Subscribers

People subscribed via source and target branches