Merge lp:~3v1n0/ubuntu-themes/bionic-sru1 into lp:ubuntu-themes/bionic

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 634
Merged at revision: 626
Proposed branch: lp:~3v1n0/ubuntu-themes/bionic-sru1
Merge into: lp:ubuntu-themes/bionic
Diff against target: 372 lines (+152/-17)
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/-1)
Radiance/gtk-3.20/gtk-widgets.css (+51/-8)
debian/changelog (+22/-0)
To merge this branch: bzr merge lp:~3v1n0/ubuntu-themes/bionic-sru1
Reviewer Review Type Date Requested Status
Ubuntu Artwork Packagers Pending
Review via email: mp+356073@code.launchpad.net

Commit message

Fixes for ubuntu 18.04 SRU1

To post a comment you must log in.
lp:~3v1n0/ubuntu-themes/bionic-sru1 updated
635. By Marco Trevisan (Treviño)

Radiance: Use scaled image for buttons border

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:06:31 +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:06:31 +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:06:31 +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:06:31 +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:06:31 +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:06:31 +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-04-21 02:46:48 +0000
195+++ Radiance/gtk-3.20/gtk-main.css 2018-10-05 00:06:31 +0000
196@@ -70,9 +70,9 @@
197 @import url("apps/mozilla.css");
198 @import url("apps/gnome-panel.css");
199 @import url("apps/gnome-boxes.css");
200-@import url("apps/gnome-builder.css");
201 @import url("apps/gnome-flashback.css");
202 @import url("apps/gnome-terminal.css");
203 @import url("apps/software-center.css");
204 @import url("apps/calendar.css");
205 @import url("apps/libreoffice.css");
206+@import url("apps/chromium.css");
207
208=== modified file 'Radiance/gtk-3.20/gtk-widgets.css'
209--- Radiance/gtk-3.20/gtk-widgets.css 2018-04-21 02:47:02 +0000
210+++ Radiance/gtk-3.20/gtk-widgets.css 2018-10-05 00:06:31 +0000
211@@ -52,7 +52,8 @@
212
213 border: 1px solid transparent;
214 border-radius: 8px;
215- border-image-source: url("assets/button.png");
216+ border-image-source: -gtk-scaled(url("assets/button.png"),
217+ url("assets/button@2.png"));
218
219 /* all button border images have the same size and are sliced in the same way */
220 border-image-width: 10px 12px 10px 12px;
221@@ -80,8 +81,7 @@
222
223
224
225-button.destructive-action,
226-headerbar button.destructive-action {
227+button.destructive-action {
228 color: white;
229 text-shadow: 0 1px alpha (shade (@error_bg_color, 1.55), 0.4);
230 background-color: shade (@error_bg_color, 1.1);
231@@ -115,7 +115,7 @@
232
233 button:focus {
234 border-image-source: -gtk-scaled(url("assets/button-focused.png"),
235- url("assets/button-focused.png@2"));
236+ url("assets/button-focused@2.png"));
237 }
238
239 button:hover {
240@@ -1171,6 +1171,11 @@
241 color: @dark_fg_color;
242 }
243
244+toolbar menu arrow,
245+combobox menu arrow {
246+ color: shade (@text_color, 1.85);
247+}
248+
249 toolbar menu,
250 combobox menu {
251 background-image: linear-gradient(to bottom left,
252@@ -1376,11 +1381,13 @@
253 color: alpha (@dark_fg_color, 0.5);
254 }
255
256-menuitem accelerator:hover {
257+menuitem:hover > label accelerator,
258+menuitem > label accelerator:hover {
259 color: alpha (@selected_fg_color, 0.8);
260 }
261
262-menuitem accelerator:disabled {
263+menuitem:disabled > label accelerator,
264+menuitem > label accelerator:disabled {
265 color: alpha (mix (@dark_fg_color, @dark_bg_color, 0.5), 0.5);
266 text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
267 }
268@@ -3208,7 +3215,6 @@
269 }
270
271 headerbar button.suggested-action:disabled * {
272- color: @fg_color;
273 text-shadow: none;
274 }
275
276@@ -3241,6 +3247,7 @@
277 }
278
279 headerbar button.destructive-action:not(:disabled) {
280+ background-color: transparent;
281 background-image: -gtk-gradient (linear, left top, left bottom,
282 from (shade (@error_bg_color, 1.10)),
283 to (shade (@error_bg_color, 0.90)));
284@@ -3274,6 +3281,7 @@
285 }
286
287 headerbar button.destructive-action:backdrop:not(:disabled) {
288+ background-color: transparent;
289 background-image: -gtk-gradient (linear, left top, left bottom,
290 from (shade (@error_bg_color, 0.65)),
291 to (shade (@error_bg_color, 0.65)));
292@@ -3320,7 +3328,6 @@
293 }
294
295 headerbar button.destructive-action:disabled * {
296- color: @fg_color;
297 text-shadow: none;
298 }
299
300@@ -3696,6 +3703,42 @@
301 -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
302 }
303
304+menu > arrow.top,
305+.menu > arrow.top,
306+.context-menu > arrow.top {
307+ -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
308+}
309+
310+menu > arrow.bottom,
311+.menu > arrow.bottom,
312+.context-menu > arrow.bottom {
313+ -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
314+}
315+
316+menu > arrow:hover,
317+.menu > arrow:hover,
318+.context-menu > arrow:hover {
319+ background-color: shade (@dark_bg_color, 1.25);
320+}
321+
322+toolbar menu > arrow:hover,
323+toolbar .menu > arrow:hover,
324+toolbar .context-menu > arrow:hover,
325+combobox menu > arrow:hover,
326+combobox .menu > arrow:hover,
327+combobox .context-menu > arrow:hover {
328+ background-color: shade (@bg_color, 0.92);
329+}
330+
331+menu > arrow:disabled,
332+.menu > arrow:disabled,
333+.context-menu > arrow:disabled {
334+ color: transparent;
335+ background-color:
336+ transparent;
337+ border-color: transparent;
338+}
339+
340 /* Floating bars */
341 .floating-bar {
342 background-color: @info_bg_color;
343
344=== modified file 'debian/changelog'
345--- debian/changelog 2018-04-21 02:47:57 +0000
346+++ debian/changelog 2018-10-05 00:06:31 +0000
347@@ -1,3 +1,25 @@
348+ubuntu-themes (16.10+18.04.20180421.1-0ubuntu2) UNRELEASED; urgency=medium
349+
350+ [ Khurshid Alam ]
351+ * Remove nonexistent gnome-builder.css (LP: #1773045)
352+
353+ [ Marco Trevisan (Treviño) ]
354+ * Radiance: fix typo in assets link for focused buttons (LP: #1781736)
355+ * Radiance: Use scaled image for buttons border (LP: #1781736)
356+ * Ambiance, Radiance: don't use padding on window buttons for chromium
357+ (LP: #1782038)
358+ * Ambiance: use default foreground color for toolbar menus (LP:
359+ #1758841)
360+ * Ambiance, Radiance: show proper arrow in combobox (LP: #1743373)
361+ * Ambiance, Radiance: use default disabled color for actions headerbar
362+ buttons (LP: #1785699)
363+ * Ambiance, Radiance: fix list selected color for gnome-boxes (LP:
364+ #1761684)
365+ * Ambiance, Radiance: properly theme disabled and hovered accelerators
366+ (LP: #1795895)
367+
368+ -- Khurshid Alam <khurshid.alam@linuxmail.org> Thu, 04 Oct 2018 20:40:09 +0200
369+
370 ubuntu-themes (16.10+18.04.20180421.1-0ubuntu1) bionic; urgency=medium
371
372 [ Carlo Lobrano ]

Subscribers

People subscribed via source and target branches