Merge lp:~larsu/ubuntu-themes/more-gtk-314-fixes into lp:ubuntu-themes
- more-gtk-314-fixes
- Merge into trunk
Proposed by
Lars Karlitski
Status: | Merged |
---|---|
Approved by: | Dmitry Shachnev |
Approved revision: | 416 |
Merged at revision: | 410 |
Proposed branch: | lp:~larsu/ubuntu-themes/more-gtk-314-fixes |
Merge into: | lp:ubuntu-themes |
Prerequisite: | lp:~larsu/ubuntu-themes/stop-using-unico |
Diff against target: |
679 lines (+51/-379) 2 files modified
Ambiance/gtk-3.0/gtk-widgets.css (+25/-183) Radiance/gtk-3.0/gtk-widgets.css (+26/-196) |
To merge this branch: | bzr merge lp:~larsu/ubuntu-themes/more-gtk-314-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Ubuntu Artwork Packagers | Pending | ||
Review via email: mp+246742@code.launchpad.net |
Commit message
A few more fixes and cleanups for gtk 3.14 (combo boxes, spinners)
Description of the change
A few more fixes and cleanups for gtk 3.14 (combo boxes, spinners)
Depends on lp:~larsu/ubuntu-themes/stop-using-unico
To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : | # |
review:
Approve
(continuous-integration)
Revision history for this message
Adolfo Jayme Barrientos (fitojb) wrote : | # |
Awesome! It fixes an issue in Gtk disclosure triangles, which didn’t spin when clicked. Also, kudos for dropping Unico!
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Ambiance/gtk-3.0/gtk-widgets.css' |
2 | --- Ambiance/gtk-3.0/gtk-widgets.css 2015-01-16 16:54:24 +0000 |
3 | +++ Ambiance/gtk-3.0/gtk-widgets.css 2015-01-16 16:54:24 +0000 |
4 | @@ -45,7 +45,6 @@ |
5 | -GtkWidget-wide-separators: true; |
6 | -GtkWidget-link-color: @link_color; |
7 | -GtkWidget-visited-link-color: @link_color; |
8 | - -GtkWindow-decoration-button-layout: "close:"; |
9 | -GtkWindow-resize-grip-width: 0; |
10 | -GtkWindow-resize-grip-height: 0; |
11 | -WnckTasklist-fade-overlay-rect: 0; |
12 | @@ -248,29 +247,33 @@ |
13 | /****************** |
14 | * Linked Widgets * |
15 | *****************/ |
16 | -.linked .entry, |
17 | -.linked .button { |
18 | +.linked > .entry, |
19 | +.linked > .button, |
20 | +.linked > GtkComboBox > .button { |
21 | border-radius: 0; |
22 | border-image-width: 10px 0 10px 0; |
23 | border-width: 1px 0 1px 0; |
24 | box-shadow: inset -1px 0 shade (@bg_color, 0.84); |
25 | } |
26 | |
27 | -.linked .entry:first-child, |
28 | -.linked .button:first-child { |
29 | +.linked > .entry:first-child, |
30 | +.linked > .button:first-child, |
31 | +.linked > GtkComboBox:first-child > .button { |
32 | border-image-width: 10px 0 10px 12px; |
33 | border-radius: 8px 0 0 8px; |
34 | } |
35 | |
36 | -.linked .entry:last-child, |
37 | -.linked .button:last-child { |
38 | +.linked > .entry:last-child, |
39 | +.linked > .button:last-child, |
40 | +.linked > GtkComboBox:last-child > .button { |
41 | border-image-width: 10px 12px 10px 0; |
42 | border-radius: 0 8px 8px 0; |
43 | box-shadow: none; |
44 | } |
45 | |
46 | -.linked .entry:only-child, |
47 | -.linked .button:only-child { |
48 | +.linked > .entry:only-child, |
49 | +.linked > .button:only-child, |
50 | +.linked > GtkComboBox:only-child > .button { |
51 | border-image-width: 10px 12px 10px 12px; |
52 | border-radius: 8px; |
53 | } |
54 | @@ -333,22 +336,6 @@ |
55 | /******************* |
56 | * check and radio * |
57 | *******************/ |
58 | -.check, |
59 | -.radio, |
60 | -.check:insensitive, |
61 | -.radio:insensitive { |
62 | - |
63 | - background-color: transparent; |
64 | - border-style: none; |
65 | - margin: 1px 0; |
66 | -} |
67 | - |
68 | -GtkCheckButton:hover, |
69 | -GtkCheckButton:active:hover, |
70 | -GtkCheckButton:selected, |
71 | -GtkCheckButton:selected:focus { |
72 | - background-color: transparent; |
73 | -} |
74 | |
75 | /* Draw a focus ring around the contained label ... */ |
76 | GtkCheckButton.text-button GtkLabel { |
77 | @@ -462,26 +449,6 @@ |
78 | -GdMainIconView-icon-size: 40; |
79 | } |
80 | |
81 | -GtkIconView.content-view.check { |
82 | - background-color: transparent; |
83 | -} |
84 | - |
85 | -GtkIconView.content-view.check:checked { |
86 | - background-color: transparent; |
87 | -} |
88 | - |
89 | -.content-view.view.check, |
90 | -.content-view.view.check:checked { |
91 | - background-color: transparent; |
92 | -} |
93 | - |
94 | -GtkIconView.content-view.check:prelight, |
95 | -GtkIconView.content-view.check:insensitive, |
96 | -GtkIconView.content-view.check:backdrop, |
97 | -GtkIconView.content-view.check:selected { |
98 | - background-color: transparent; |
99 | -} |
100 | - |
101 | /********* |
102 | * entry * |
103 | *********/ |
104 | @@ -586,10 +553,6 @@ |
105 | inset 0 -1px shade (@selected_bg_color, 1.0); |
106 | } |
107 | |
108 | -GtkIconView.cell { |
109 | - background-color: transparent; |
110 | -} |
111 | - |
112 | .rubberband { |
113 | background-color: alpha (@selected_bg_color, 0.35); |
114 | border-color: @selected_bg_color; |
115 | @@ -598,11 +561,7 @@ |
116 | border-width: 1px; |
117 | } |
118 | |
119 | -/********* |
120 | - * image * |
121 | - *********/ |
122 | -GtkImage, |
123 | -GtkImage:insensitive { |
124 | +GtkIconView.cell { |
125 | background-color: transparent; |
126 | } |
127 | |
128 | @@ -681,23 +640,6 @@ |
129 | inset 0 -1px shade (@error_bg_color, 1.04); |
130 | } |
131 | |
132 | -/********* |
133 | - * label * |
134 | - *********/ |
135 | -GtkLabel, |
136 | -GtkLabel:insensitive { |
137 | - background-color: transparent; |
138 | -} |
139 | - |
140 | -/********* |
141 | - * stack * |
142 | - *********/ |
143 | - |
144 | -GtkHeaderBar > GtkStack, |
145 | -GtkHeaderBar > GtkStack:insensitive { |
146 | - background-color: transparent; |
147 | -} |
148 | - |
149 | /******** |
150 | * menu * |
151 | ********/ |
152 | @@ -1192,10 +1134,6 @@ |
153 | -GtkScale-slider-length: 13; |
154 | } |
155 | |
156 | -.scale.slider { |
157 | - background-color: transparent; |
158 | -} |
159 | - |
160 | .scale.trough.highlight { |
161 | background-color: #df784e; |
162 | background-image: none; |
163 | @@ -1448,116 +1386,26 @@ |
164 | * spinner * |
165 | ***********/ |
166 | @keyframes spinner { |
167 | - 0.00% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
168 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), |
169 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), |
170 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), |
171 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), |
172 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), |
173 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), |
174 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); } |
175 | - |
176 | - 12.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), |
177 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), |
178 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), |
179 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), |
180 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), |
181 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), |
182 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), |
183 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); } |
184 | - |
185 | - 25.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), |
186 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), |
187 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), |
188 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), |
189 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), |
190 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), |
191 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
192 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)); } |
193 | - |
194 | - 37.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), |
195 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), |
196 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), |
197 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), |
198 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), |
199 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
200 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), |
201 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)); } |
202 | - |
203 | - 50.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), |
204 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), |
205 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), |
206 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), |
207 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
208 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), |
209 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), |
210 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)); } |
211 | - |
212 | - 62.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), |
213 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), |
214 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), |
215 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
216 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), |
217 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), |
218 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), |
219 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)); } |
220 | - |
221 | - 75.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), |
222 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), |
223 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
224 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), |
225 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), |
226 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), |
227 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), |
228 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)); } |
229 | - |
230 | - 87.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), |
231 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
232 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), |
233 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), |
234 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), |
235 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), |
236 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), |
237 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)); } |
238 | - |
239 | - 100% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
240 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), |
241 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), |
242 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), |
243 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), |
244 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), |
245 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), |
246 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); } |
247 | + to { -gtk-icon-transform: rotate(1turn); } |
248 | } |
249 | |
250 | .spinner { |
251 | - background-color: transparent; |
252 | - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
253 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
254 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
255 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
256 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
257 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
258 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
259 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); |
260 | - background-position: 14% 14%, 0% 50%, 14% 86%, 50% 100%, 86% 86%, 100% 50%, 86% 14%, 50% 0%; |
261 | - background-size: 20% 20%; |
262 | - background-repeat: no-repeat; |
263 | -} |
264 | - |
265 | -.menu .spinner, |
266 | -.menu .spinner:hover, |
267 | -.primary-toolbar .spinner, |
268 | -.primary-toolbar .spinner, |
269 | -.header-bar .spinner, |
270 | -.header-bar .spinner { |
271 | + -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); |
272 | color: @selected_bg_color; |
273 | - border: none; |
274 | - box-shadow: none; |
275 | + opacity: 0; |
276 | } |
277 | |
278 | .spinner:active { |
279 | animation: spinner 1s infinite linear; |
280 | + opacity: 1; |
281 | +} |
282 | + |
283 | +.spinner:active:backdrop { |
284 | + color: @backdrop_fg_color; |
285 | +} |
286 | + |
287 | +.spinner:active:insensitive { |
288 | + opacity: 0.5; |
289 | } |
290 | |
291 | /************* |
292 | @@ -1686,7 +1534,6 @@ |
293 | } |
294 | |
295 | .titlebar.header-bar .button.titlebutton { |
296 | - background-color: transparent; |
297 | border-image-width: 0; |
298 | box-shadow: none; |
299 | } |
300 | @@ -1979,14 +1826,9 @@ |
301 | border-style: solid; |
302 | border-width: 1px; |
303 | |
304 | - background-color: transparent; |
305 | color: @tooltip_fg_color; |
306 | } |
307 | |
308 | -.tooltip * { |
309 | - background-color: transparent; |
310 | -} |
311 | - |
312 | /************ |
313 | * treeview * |
314 | ************/ |
315 | |
316 | === modified file 'Radiance/gtk-3.0/gtk-widgets.css' |
317 | --- Radiance/gtk-3.0/gtk-widgets.css 2015-01-16 16:54:24 +0000 |
318 | +++ Radiance/gtk-3.0/gtk-widgets.css 2015-01-16 16:54:24 +0000 |
319 | @@ -44,7 +44,6 @@ |
320 | -GtkWidget-separator-height: 2; |
321 | -GtkWidget-link-color: @link_color; |
322 | -GtkWidget-visited-link-color: @link_color; |
323 | - -GtkWindow-decoration-button-layout: "close:"; |
324 | -GtkWindow-resize-grip-width: 0; |
325 | -GtkWindow-resize-grip-height: 0; |
326 | -WnckTasklist-fade-overlay-rect: 0; |
327 | @@ -247,29 +246,33 @@ |
328 | /****************** |
329 | * Linked Widgets * |
330 | *****************/ |
331 | -.linked .entry, |
332 | -.linked .button { |
333 | +.linked > .entry, |
334 | +.linked > .button, |
335 | +.linked > GtkComboBox > .button { |
336 | border-radius: 0; |
337 | border-image-width: 10px 0 10px 0; |
338 | border-width: 1px 0 1px 0; |
339 | box-shadow: inset -1px 0 shade (@bg_color, 0.84); |
340 | } |
341 | |
342 | -.linked .entry:first-child, |
343 | -.linked .button:first-child { |
344 | +.linked > .entry:first-child, |
345 | +.linked > .button:first-child, |
346 | +.linked > GtkComboBox:first-child > .button { |
347 | border-image-width: 10px 0 10px 12px; |
348 | border-radius: 8px 0 0 8px; |
349 | } |
350 | |
351 | -.linked .entry:last-child, |
352 | -.linked .button:last-child { |
353 | +.linked > .entry:last-child, |
354 | +.linked > .button:last-child, |
355 | +.linked > GtkComboBox:last-child > .button { |
356 | border-image-width: 10px 12px 10px 0; |
357 | border-radius: 0 8px 8px 0; |
358 | box-shadow: none; |
359 | } |
360 | |
361 | -.linked .entry:only-child, |
362 | -.linked .button:only-child { |
363 | +.linked > .entry:only-child, |
364 | +.linked > .button:only-child, |
365 | +.linked > GtkComboBox:only-child > .button { |
366 | border-image-width: 10px 12px 10px 12px; |
367 | border-radius: 8px; |
368 | } |
369 | @@ -336,22 +339,6 @@ |
370 | /******************* |
371 | * check and radio * |
372 | *******************/ |
373 | -.check, |
374 | -.radio, |
375 | -.check:insensitive, |
376 | -.radio:insensitive { |
377 | - |
378 | - background-color: transparent; |
379 | - border-style: none; |
380 | - margin: 1px 0; |
381 | -} |
382 | - |
383 | -GtkCheckButton:hover, |
384 | -GtkCheckButton:active:hover, |
385 | -GtkCheckButton:selected, |
386 | -GtkCheckButton:selected:focus { |
387 | - background-color: transparent; |
388 | -} |
389 | |
390 | /* Draw a focus ring around the contained label ... */ |
391 | GtkCheckButton.text-button GtkLabel { |
392 | @@ -465,26 +452,6 @@ |
393 | -GdMainIconView-icon-size: 40; |
394 | } |
395 | |
396 | -GtkIconView.content-view.check { |
397 | - background-color: transparent; |
398 | -} |
399 | - |
400 | -GtkIconView.content-view.check:checked { |
401 | - background-color: transparent; |
402 | -} |
403 | - |
404 | -.content-view.view.check, |
405 | -.content-view.view.check:checked { |
406 | - background-color: transparent; |
407 | -} |
408 | - |
409 | -GtkIconView.content-view.check:prelight, |
410 | -GtkIconView.content-view.check:insensitive, |
411 | -GtkIconView.content-view.check:backdrop, |
412 | -GtkIconView.content-view.check:selected { |
413 | - background-color: transparent; |
414 | -} |
415 | - |
416 | /********* |
417 | * entry * |
418 | *********/ |
419 | @@ -588,10 +555,6 @@ |
420 | inset 0 -1px shade (@selected_bg_color, 1.0); |
421 | } |
422 | |
423 | -GtkIconView.cell { |
424 | - background-color: transparent; |
425 | -} |
426 | - |
427 | .rubberband { |
428 | background-color: alpha (@selected_bg_color, 0.35); |
429 | border-color: @selected_bg_color; |
430 | @@ -600,11 +563,7 @@ |
431 | border-width: 1px; |
432 | } |
433 | |
434 | -/********* |
435 | - * image * |
436 | - *********/ |
437 | -GtkImage, |
438 | -GtkImage:insensitive { |
439 | +GtkIconView.cell { |
440 | background-color: transparent; |
441 | } |
442 | |
443 | @@ -683,23 +642,6 @@ |
444 | inset 0 -1px shade (@error_bg_color, 1.04); |
445 | } |
446 | |
447 | -/********* |
448 | - * label * |
449 | - *********/ |
450 | -GtkLabel, |
451 | -GtkLabel:insensitive { |
452 | - background-color: transparent; |
453 | -} |
454 | - |
455 | -/********* |
456 | - * stack * |
457 | - *********/ |
458 | - |
459 | -GtkHeaderBar > GtkStack, |
460 | -GtkHeaderBar > GtkStack:insensitive { |
461 | - background-color: transparent; |
462 | -} |
463 | - |
464 | /******** |
465 | * menu * |
466 | ********/ |
467 | @@ -1193,10 +1135,6 @@ |
468 | -GtkScale-slider-length: 13; |
469 | } |
470 | |
471 | -.scale.slider { |
472 | - background-color: transparent; |
473 | -} |
474 | - |
475 | .scale.trough.highlight { |
476 | background-color: #df784e; |
477 | background-image: none; |
478 | @@ -1276,10 +1214,6 @@ |
479 | inset 0 -1px shade (@bg_color, 1.01); |
480 | } |
481 | |
482 | -.scrollbar.button, |
483 | -.scrollbar.button:insensitive { |
484 | -} |
485 | - |
486 | /* overlay scrollbar */ |
487 | OsThumb { |
488 | color: shade (@fg_color, 1.6); |
489 | @@ -1391,10 +1325,6 @@ |
490 | /*********** |
491 | * sidebar * |
492 | ***********/ |
493 | -.sidebar, |
494 | -.sidebar .view { |
495 | -} |
496 | - |
497 | .sidebar row:selected { |
498 | text-shadow: 0 1px shade (@selected_bg_color, 0.7); |
499 | } |
500 | @@ -1456,116 +1386,26 @@ |
501 | * spinner * |
502 | ***********/ |
503 | @keyframes spinner { |
504 | - 0.00% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
505 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), |
506 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), |
507 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), |
508 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), |
509 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), |
510 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), |
511 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); } |
512 | - |
513 | - 12.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), |
514 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), |
515 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), |
516 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), |
517 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), |
518 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), |
519 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), |
520 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); } |
521 | - |
522 | - 25.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), |
523 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), |
524 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), |
525 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), |
526 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), |
527 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), |
528 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
529 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)); } |
530 | - |
531 | - 37.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), |
532 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), |
533 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), |
534 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), |
535 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), |
536 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
537 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), |
538 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)); } |
539 | - |
540 | - 50.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), |
541 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), |
542 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), |
543 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), |
544 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
545 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), |
546 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), |
547 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)); } |
548 | - |
549 | - 62.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), |
550 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), |
551 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), |
552 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
553 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), |
554 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), |
555 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), |
556 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)); } |
557 | - |
558 | - 75.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), |
559 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), |
560 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
561 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), |
562 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), |
563 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), |
564 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), |
565 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)); } |
566 | - |
567 | - 87.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), |
568 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
569 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), |
570 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), |
571 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), |
572 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), |
573 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), |
574 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)); } |
575 | - |
576 | - 100% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
577 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), |
578 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), |
579 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), |
580 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), |
581 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), |
582 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), |
583 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); } |
584 | + to { -gtk-icon-transform: rotate(1turn); } |
585 | } |
586 | |
587 | .spinner { |
588 | - background-color: transparent; |
589 | - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
590 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
591 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
592 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
593 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
594 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
595 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), |
596 | - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); |
597 | - background-position: 14% 14%, 0% 50%, 14% 86%, 50% 100%, 86% 86%, 100% 50%, 86% 14%, 50% 0%; |
598 | - background-size: 20% 20%; |
599 | - background-repeat: no-repeat; |
600 | -} |
601 | - |
602 | -.menu .spinner, |
603 | -.menu .spinner:hover, |
604 | -.primary-toolbar .spinner, |
605 | -.primary-toolbar .spinner, |
606 | -.header-bar .spinner, |
607 | -.header-bar .spinner { |
608 | + -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); |
609 | color: @selected_bg_color; |
610 | - border: none; |
611 | - box-shadow: none; |
612 | + opacity: 0; |
613 | } |
614 | |
615 | .spinner:active { |
616 | animation: spinner 1s infinite linear; |
617 | + opacity: 1; |
618 | +} |
619 | + |
620 | +.spinner:active:backdrop { |
621 | + color: @backdrop_fg_color; |
622 | +} |
623 | + |
624 | +.spinner:active:insensitive { |
625 | + opacity: 0.5; |
626 | } |
627 | |
628 | /************* |
629 | @@ -1692,7 +1532,6 @@ |
630 | } |
631 | |
632 | .titlebar.header-bar .button.titlebutton { |
633 | - background-color: transparent; |
634 | border-image-width: 0; |
635 | box-shadow: none; |
636 | } |
637 | @@ -1701,7 +1540,6 @@ |
638 | border-image-width: 12px; |
639 | } |
640 | |
641 | - |
642 | /*********** |
643 | * toolbar * |
644 | ***********/ |
645 | @@ -1886,10 +1724,6 @@ |
646 | icon-shadow: 0 1px shade (@bg_color, 1.16); |
647 | } |
648 | |
649 | -.inline-toolbar.toolbar .button *:insensitive, |
650 | -.inline-toolbar.toolbar GtkToolButton .button:insensitive { |
651 | -} |
652 | - |
653 | /* Middle button */ |
654 | .inline-toolbar.toolbar .button, |
655 | .inline-toolbar.toolbar .button:active, |
656 | @@ -1993,10 +1827,6 @@ |
657 | color: @tooltip_fg_color; |
658 | } |
659 | |
660 | -.tooltip * { |
661 | - background-color: transparent; |
662 | -} |
663 | - |
664 | /************ |
665 | * treeview * |
666 | ************/ |
667 | @@ -2072,7 +1902,6 @@ |
668 | color: @fg_color; |
669 | } |
670 | |
671 | - |
672 | .popover .menuitem:checked, |
673 | .popover .menuitem.check, |
674 | .popover .menuitem.check:checked, |
675 | @@ -2109,3 +1938,4 @@ |
676 | |
677 | color: @backdrop_selected_fg_color; |
678 | } |
679 | + |
PASSED: Continuous integration, rev:416 jenkins. qa.ubuntu. com/job/ ubuntu- themes- ci/89/ jenkins. qa.ubuntu. com/job/ ubuntu- themes- vivid-amd64- ci/3 jenkins. qa.ubuntu. com/job/ ubuntu- themes- vivid-armhf- ci/3 jenkins. qa.ubuntu. com/job/ ubuntu- themes- vivid-i386- ci/3
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- themes- ci/89/rebuild
http://