Merge lp:~3v1n0/ubuntu-themes/cosmic-fixes into lp:ubuntu-themes

Proposed by Marco Trevisan (Treviño) on 2018-10-03
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2018-10-04
Approved revision: 635
Merged at revision: 627
Proposed branch: lp:~3v1n0/ubuntu-themes/cosmic-fixes
Merge into: lp:ubuntu-themes
Diff against target: 368 lines (+154/-16)
9 files modified
Ambiance/gtk-3.20/apps/chromium.css (+4/-0)
Ambiance/gtk-3.20/apps/gnome-boxes.css (+10/-1)
Ambiance/gtk-3.20/gtk-main.css (+1/-0)
Ambiance/gtk-3.20/gtk-widgets.css (+49/-6)
Radiance/gtk-3.20/apps/chromium.css (+4/-0)
Radiance/gtk-3.20/apps/gnome-boxes.css (+10/-1)
Radiance/gtk-3.20/gtk-main.css (+1/-0)
Radiance/gtk-3.20/gtk-widgets.css (+51/-8)
debian/changelog (+24/-0)
To merge this branch: bzr merge lp:~3v1n0/ubuntu-themes/cosmic-fixes
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) 2018-10-03 Approve on 2018-10-05
Review via email: mp+356072@code.launchpad.net

Commit message

Ambiance, Radiance: improve theming as per bionic reviews and bug reports

To post a comment you must log in.
Andrea Azzarone (azzar1) wrote :

> Ambiance, Radiance: use default disabled color for actions headerbar buttons (LP: #1743373)

The bug number seems incorrect. Can you please fix this and also link the bug to the MR?

Andrea Azzarone (azzar1) wrote :

Once fixed it looks good to me.

Marco Trevisan (Treviño) (3v1n0) wrote :

Thanks for spotting, fixed now.

Actual bug I wanted to link was https://launchpad.net/bugs/1785699

lp:~3v1n0/ubuntu-themes/cosmic-fixes updated on 2018-10-05
635. By Marco Trevisan (Treviño) on 2018-10-03

debian/changelog: sync with bzr changes

636. By Marco Trevisan (Treviño) on 2018-10-05

Radiance: Use scaled image for buttons border

Andrea Azzarone (azzar1) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'Ambiance/gtk-3.20/apps/chromium.css'
2--- Ambiance/gtk-3.20/apps/chromium.css 1970-01-01 00:00:00 +0000
3+++ Ambiance/gtk-3.20/apps/chromium.css 2018-10-05 00:11:29 +0000
4@@ -0,0 +1,4 @@
5+.chromium.maximized .titlebar button.titlebutton
6+{
7+ padding: 0;
8+}
9
10=== modified file 'Ambiance/gtk-3.20/apps/gnome-boxes.css'
11--- Ambiance/gtk-3.20/apps/gnome-boxes.css 2017-08-29 10:44:28 +0000
12+++ Ambiance/gtk-3.20/apps/gnome-boxes.css 2018-10-05 00:11:29 +0000
13@@ -1,5 +1,14 @@
14 @define-color bg_menu_row shade (@bg_color, 0.6);
15
16+.boxes-menu-row,
17+.boxes-menu-row:selected {
18+ color: inherit;
19+}
20+
21+button.boxes-menu-row {
22+ border-radius: 3px;
23+}
24+
25 .boxes-menu-row > .dim-label {
26- color: shade (@bg_menu_row, 0.6);
27+ color: shade (@bg_menu_row, 0.6);
28 }
29
30=== modified file 'Ambiance/gtk-3.20/gtk-main.css'
31--- Ambiance/gtk-3.20/gtk-main.css 2018-04-21 02:46:48 +0000
32+++ Ambiance/gtk-3.20/gtk-main.css 2018-10-05 00:11:29 +0000
33@@ -72,3 +72,4 @@
34 @import url("apps/software-center.css");
35 @import url("apps/calendar.css");
36 @import url("apps/libreoffice.css");
37+@import url("apps/chromium.css");
38
39=== modified file 'Ambiance/gtk-3.20/gtk-widgets.css'
40--- Ambiance/gtk-3.20/gtk-widgets.css 2018-04-21 02:47:02 +0000
41+++ Ambiance/gtk-3.20/gtk-widgets.css 2018-10-05 00:11:29 +0000
42@@ -79,8 +79,7 @@
43 text-decoration-line: underline;
44 }
45
46-button.destructive-action,
47-headerbar button.destructive-action {
48+button.destructive-action {
49 color: white;
50 text-shadow: 0 1px alpha (shade (@error_bg_color, 1.55), 0.4);
51 background-color: shade (@error_bg_color, 1.1);
52@@ -1166,6 +1165,11 @@
53 color: @dark_fg_color;
54 }
55
56+toolbar menu arrow,
57+combobox menu arrow {
58+ color: shade (@text_color, 1.85);
59+}
60+
61 toolbar menu,
62 combobox menu {
63 background-image: linear-gradient(to bottom left,
64@@ -1173,6 +1177,7 @@
65 shade (@bg_color, 0.97),
66 shade (@bg_color, 1.2));
67 background-color: transparent;
68+ color: @fg_color;
69 border: none;
70 padding: 0;
71
72@@ -1371,11 +1376,13 @@
73 color: alpha (@dark_fg_color, 0.5);
74 }
75
76-menuitem accelerator:hover {
77+menuitem:hover > label accelerator,
78+menuitem > label accelerator:hover {
79 color: alpha (@selected_fg_color, 0.8);
80 }
81
82-menuitem accelerator:disabled {
83+menuitem:disabled > label accelerator,
84+menuitem > label accelerator:disabled {
85 color: alpha (mix (@dark_fg_color, @dark_bg_color, 0.5), 0.5);
86 text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
87 }
88@@ -3202,7 +3209,6 @@
89 }
90
91 headerbar button.suggested-action:disabled * {
92- color: @fg_color;
93 text-shadow: none;
94 }
95
96@@ -3235,6 +3241,7 @@
97 }
98
99 headerbar button.destructive-action:not(:disabled) {
100+ background-color: transparent;
101 background-image: -gtk-gradient (linear, left top, left bottom,
102 from (shade (@error_bg_color, 1.10)),
103 to (shade (@error_bg_color, 0.90)));
104@@ -3268,6 +3275,7 @@
105 }
106
107 headerbar button.destructive-action:backdrop:not(:disabled) {
108+ background-color: transparent;
109 background-image: -gtk-gradient (linear, left top, left bottom,
110 from (shade (@error_bg_color, 0.65)),
111 to (shade (@error_bg_color, 0.65)));
112@@ -3314,7 +3322,6 @@
113 }
114
115 headerbar button.destructive-action:disabled * {
116- color: @fg_color;
117 text-shadow: none;
118 }
119
120@@ -3691,6 +3698,42 @@
121 -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
122 }
123
124+menu > arrow.top,
125+.menu > arrow.top,
126+.context-menu > arrow.top {
127+ -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
128+}
129+
130+menu > arrow.bottom,
131+.menu > arrow.bottom,
132+.context-menu > arrow.bottom {
133+ -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
134+}
135+
136+menu > arrow:hover,
137+.menu > arrow:hover,
138+.context-menu > arrow:hover {
139+ background-color: shade (@dark_bg_color, 1.25);
140+}
141+
142+toolbar menu > arrow:hover,
143+toolbar .menu > arrow:hover,
144+toolbar .context-menu > arrow:hover,
145+combobox menu > arrow:hover,
146+combobox .menu > arrow:hover,
147+combobox .context-menu > arrow:hover {
148+ background-color: shade (@bg_color, 0.92);
149+}
150+
151+menu > arrow:disabled,
152+.menu > arrow:disabled,
153+.context-menu > arrow:disabled {
154+ color: transparent;
155+ background-color:
156+ transparent;
157+ border-color: transparent;
158+}
159+
160 /* Floating bars */
161 .floating-bar {
162 background-color: @info_bg_color;
163
164=== added file 'Radiance/gtk-3.20/apps/chromium.css'
165--- Radiance/gtk-3.20/apps/chromium.css 1970-01-01 00:00:00 +0000
166+++ Radiance/gtk-3.20/apps/chromium.css 2018-10-05 00:11:29 +0000
167@@ -0,0 +1,4 @@
168+.chromium.maximized .titlebar button.titlebutton
169+{
170+ padding: 0;
171+}
172
173=== modified file 'Radiance/gtk-3.20/apps/gnome-boxes.css'
174--- Radiance/gtk-3.20/apps/gnome-boxes.css 2017-08-29 10:44:28 +0000
175+++ Radiance/gtk-3.20/apps/gnome-boxes.css 2018-10-05 00:11:29 +0000
176@@ -1,5 +1,14 @@
177 @define-color bg_menu_row shade (@bg_color, 0.6);
178
179+.boxes-menu-row,
180+.boxes-menu-row:selected {
181+ color: inherit;
182+}
183+
184+button.boxes-menu-row {
185+ border-radius: 3px;
186+}
187+
188 .boxes-menu-row > .dim-label {
189- color: shade (@bg_menu_row, 0.6);
190+ color: shade (@bg_menu_row, 0.6);
191 }
192
193=== modified file 'Radiance/gtk-3.20/gtk-main.css'
194--- Radiance/gtk-3.20/gtk-main.css 2018-10-01 13:15:54 +0000
195+++ Radiance/gtk-3.20/gtk-main.css 2018-10-05 00:11:29 +0000
196@@ -75,3 +75,4 @@
197 @import url("apps/software-center.css");
198 @import url("apps/calendar.css");
199 @import url("apps/libreoffice.css");
200+@import url("apps/chromium.css");
201
202=== modified file 'Radiance/gtk-3.20/gtk-widgets.css'
203--- Radiance/gtk-3.20/gtk-widgets.css 2018-04-21 02:47:02 +0000
204+++ Radiance/gtk-3.20/gtk-widgets.css 2018-10-05 00:11:29 +0000
205@@ -52,7 +52,8 @@
206
207 border: 1px solid transparent;
208 border-radius: 8px;
209- border-image-source: url("assets/button.png");
210+ border-image-source: -gtk-scaled(url("assets/button.png"),
211+ url("assets/button@2.png"));
212
213 /* all button border images have the same size and are sliced in the same way */
214 border-image-width: 10px 12px 10px 12px;
215@@ -80,8 +81,7 @@
216
217
218
219-button.destructive-action,
220-headerbar button.destructive-action {
221+button.destructive-action {
222 color: white;
223 text-shadow: 0 1px alpha (shade (@error_bg_color, 1.55), 0.4);
224 background-color: shade (@error_bg_color, 1.1);
225@@ -115,7 +115,7 @@
226
227 button:focus {
228 border-image-source: -gtk-scaled(url("assets/button-focused.png"),
229- url("assets/button-focused.png@2"));
230+ url("assets/button-focused@2.png"));
231 }
232
233 button:hover {
234@@ -1171,6 +1171,11 @@
235 color: @dark_fg_color;
236 }
237
238+toolbar menu arrow,
239+combobox menu arrow {
240+ color: shade (@text_color, 1.85);
241+}
242+
243 toolbar menu,
244 combobox menu {
245 background-image: linear-gradient(to bottom left,
246@@ -1376,11 +1381,13 @@
247 color: alpha (@dark_fg_color, 0.5);
248 }
249
250-menuitem accelerator:hover {
251+menuitem:hover > label accelerator,
252+menuitem > label accelerator:hover {
253 color: alpha (@selected_fg_color, 0.8);
254 }
255
256-menuitem accelerator:disabled {
257+menuitem:disabled > label accelerator,
258+menuitem > label accelerator:disabled {
259 color: alpha (mix (@dark_fg_color, @dark_bg_color, 0.5), 0.5);
260 text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
261 }
262@@ -3208,7 +3215,6 @@
263 }
264
265 headerbar button.suggested-action:disabled * {
266- color: @fg_color;
267 text-shadow: none;
268 }
269
270@@ -3241,6 +3247,7 @@
271 }
272
273 headerbar button.destructive-action:not(:disabled) {
274+ background-color: transparent;
275 background-image: -gtk-gradient (linear, left top, left bottom,
276 from (shade (@error_bg_color, 1.10)),
277 to (shade (@error_bg_color, 0.90)));
278@@ -3274,6 +3281,7 @@
279 }
280
281 headerbar button.destructive-action:backdrop:not(:disabled) {
282+ background-color: transparent;
283 background-image: -gtk-gradient (linear, left top, left bottom,
284 from (shade (@error_bg_color, 0.65)),
285 to (shade (@error_bg_color, 0.65)));
286@@ -3320,7 +3328,6 @@
287 }
288
289 headerbar button.destructive-action:disabled * {
290- color: @fg_color;
291 text-shadow: none;
292 }
293
294@@ -3696,6 +3703,42 @@
295 -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
296 }
297
298+menu > arrow.top,
299+.menu > arrow.top,
300+.context-menu > arrow.top {
301+ -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
302+}
303+
304+menu > arrow.bottom,
305+.menu > arrow.bottom,
306+.context-menu > arrow.bottom {
307+ -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
308+}
309+
310+menu > arrow:hover,
311+.menu > arrow:hover,
312+.context-menu > arrow:hover {
313+ background-color: shade (@dark_bg_color, 1.25);
314+}
315+
316+toolbar menu > arrow:hover,
317+toolbar .menu > arrow:hover,
318+toolbar .context-menu > arrow:hover,
319+combobox menu > arrow:hover,
320+combobox .menu > arrow:hover,
321+combobox .context-menu > arrow:hover {
322+ background-color: shade (@bg_color, 0.92);
323+}
324+
325+menu > arrow:disabled,
326+.menu > arrow:disabled,
327+.context-menu > arrow:disabled {
328+ color: transparent;
329+ background-color:
330+ transparent;
331+ border-color: transparent;
332+}
333+
334 /* Floating bars */
335 .floating-bar {
336 background-color: @info_bg_color;
337
338=== modified file 'debian/changelog'
339--- debian/changelog 2018-04-21 02:47:57 +0000
340+++ debian/changelog 2018-10-05 00:11:29 +0000
341@@ -1,3 +1,27 @@
342+ubuntu-themes (16.10+18.04.20180421.1-0ubuntu2) UNRELEASED; urgency=medium
343+
344+ [ Khurshid Alam ]
345+ * Remove nonexistent gnome-builder.css (LP: #1773045)
346+
347+ [ Marco Trevisan (Treviño) ]
348+ * Radiance: fix typo in assets link for focused buttons (LP: #1781736)
349+ * Radiance: Use scaled image for buttons border (LP: #1781736)
350+ * Ambiance, Radiance: don't use padding on window buttons for chromium
351+ (LP: #1782038)
352+ * Ambiance: use default foreground color for toolbar menus (LP:
353+ #1758841)
354+ * Ambiance, Radiance: show proper arrow in combobox (LP: #1743373)
355+ * Ambiance, Radiance: use default disabled color for actions headerbar
356+ buttons (LP: #1785699)
357+ * Ambiace, Radiance: use headerbar destructive-action definition for
358+ buttons
359+ * Ambiance, Radiance: fix list selected color for gnome-boxes (LP:
360+ #1761684)
361+ * Ambiance, Radiance: properly theme disabled and hovered accelerators
362+ (LP: #1795895)
363+
364+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Wed, 03 Oct 2018 09:09:22 -0500
365+
366 ubuntu-themes (16.10+18.04.20180421.1-0ubuntu1) bionic; urgency=medium
367
368 [ Carlo Lobrano ]

Subscribers

People subscribed via source and target branches