Ubuntu theme

Merge lp:~dashua/ubuntu-themes/ubuntu-themes into lp:ubuntu-themes

  1. ubuntu-themes
  2. Merge into trunk
Proposed by James Schriver
Status: Merged
Merged at revision: 299
Proposed branch: lp:~dashua/ubuntu-themes/ubuntu-themes
Merge into: lp:ubuntu-themes
Diff against target: 2253 lines (+1116/-129)
9 files modified
Ambiance/gtk-3.0/gtk-widgets-assets.css (+12/-0)
Ambiance/gtk-3.0/gtk-widgets-borders.css (+106/-16)
Ambiance/gtk-3.0/gtk-widgets.css (+325/-29)
Radiance/gtk-3.0/gtk-widgets-assets.css (+12/-0)
Radiance/gtk-3.0/gtk-widgets-backdrop.css (+137/-23)
Radiance/gtk-3.0/gtk-widgets-borders-radiance.css (+24/-8)
Radiance/gtk-3.0/gtk-widgets-borders.css (+106/-16)
Radiance/gtk-3.0/gtk-widgets-radiance.css (+66/-10)
Radiance/gtk-3.0/gtk-widgets.css (+328/-27)
To merge this branch: bzr merge lp:~dashua/ubuntu-themes/ubuntu-themes
Reviewer Review Type Date Requested Status
Ubuntu Artwork Packagers Pending
Review via email: mp+177301@code.launchpad.net

Description of the change

Add symbolic theming to toolbars Ambiance/Radiance. Patch by Exalm (LP: #1118838)

To post a comment you must log in.

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-assets.css'
2--- Ambiance/gtk-3.0/gtk-widgets-assets.css 2012-10-10 11:38:40 +0000
3+++ Ambiance/gtk-3.0/gtk-widgets-assets.css 2013-07-28 23:09:26 +0000
4@@ -383,16 +383,22 @@
5 }*/
6
7 .primary-toolbar .menu .check,
8+.menubar.toolbar .menu .check,
9+.header-bar .menu .check,
10 .menu .check {
11 background-image: url("assets/check-menuitem-unselected.png");
12 }
13
14 .primary-toolbar .menu .radio,
15+.menubar.toolbar .menu .radio,
16+.header-bar .menu .radio,
17 .menu .radio {
18 background-image: url("assets/check-menuitem-unselected.png");
19 }
20
21 .primary-toolbar .menu .check:active,
22+.menubar.toolbar .menu .check:active,
23+.header-bar .menu .check:active,
24 .toolbar .menu .check:active:hover,
25 .menu .check:active,
26 .menu .check:active:hover {
27@@ -400,6 +406,8 @@
28 }
29
30 .primary-toolbar .menu .check:active:insensitive,
31+.menubar.toolbar .menu .check:active:insensitive,
32+.header-bar .menu .check:active:insensitive,
33 .toolbar .menu .check:active:hover:insensitive,
34 .menu .check:active:insensitive,
35 .menu .check:active:hover:insensitive {
36@@ -407,6 +415,8 @@
37 }
38
39 .primary-toolbar .menu .radio:active,
40+.menubar.toolbar .menu .radio:active,
41+.header-bar .menu .radio:active,
42 .toolbar .menu .radio:active:hover,
43 .menu .radio:active,
44 .menu .radio:active:hover {
45@@ -414,6 +424,8 @@
46 }
47
48 .primary-toolbar .menu .radio:active:insensitive,
49+.menubar.toolbar .menu .radio:active:insensitive,
50+.header-bar .menu .radio:active:insensitive,
51 .toolbar .menu .radio:active:hover:insensitive,
52 .menu .radio:active:insensitive,
53 .menu .radio:active:hover:insensitive {
54
55=== modified file 'Ambiance/gtk-3.0/gtk-widgets-borders.css'
56--- Ambiance/gtk-3.0/gtk-widgets-borders.css 2012-08-30 13:10:54 +0000
57+++ Ambiance/gtk-3.0/gtk-widgets-borders.css 2013-07-28 23:09:26 +0000
58@@ -110,27 +110,39 @@
59 border-image: url("assets/button-default-focused-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
60 }
61
62-.primary-toolbar .button {
63+.primary-toolbar .button,
64+.menubar.toolbar .button,
65+.header-bar .button {
66 border-image: url("assets/button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
67 }
68
69-.primary-toolbar .button:focused {
70+.primary-toolbar .button:focused,
71+.menubar.toolbar .button:focused,
72+.header-bar .button:focused {
73 border-image: url("assets/button-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
74 }
75
76-.primary-toolbar .button:active {
77+.primary-toolbar .button:active,
78+.menubar.toolbar .button:active,
79+.header-bar .button:active {
80 border-image: url("assets/button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
81 }
82
83-.primary-toolbar .button:active:focused {
84+.primary-toolbar .button:active:focused,
85+.menubar.toolbar .button:active:focused,
86+.header-bar .button:active:focused {
87 border-image: url("assets/button-toolbar-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
88 }
89
90-.primary-toolbar .button:backdrop {
91+.primary-toolbar .button:backdrop,
92+.menubar.toolbar .button:backdrop,
93+.header-bar .button:backdrop {
94 border-image: url("assets/backdrop-button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
95 }
96
97-.primary-toolbar .button:active:backdrop {
98+.primary-toolbar .button:active:backdrop,
99+.menubar.toolbar .button:active:backdrop,
100+.header-bar .button:active:backdrop {
101 border-image: url("assets/backdrop-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
102 }
103
104@@ -176,16 +188,24 @@
105 border-image: url("assets/backdrop-entry-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
106 }
107
108-.primary-toolbar .entry {
109+.primary-toolbar .entry,
110+.menubar.toolbar .entry,
111+.header-bar .entry {
112 border-image: url("assets/entry-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
113 }
114
115-.primary-toolbar .entry:focus {
116+.primary-toolbar .entry:focus,
117+.menubar.toolbar .entry:focus,
118+.header-bar .entry:focus {
119 border-image: url("assets/entry-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
120 }
121
122 .primary-toolbar .entry.progressbar,
123 .primary-toolbar .entry.progressbar,
124+.menubar.toolbar .entry.progressbar,
125+.menubar.toolbar .entry.progressbar,
126+.header-bar .entry.progressbar,
127+.header-bar .entry.progressbar,
128 .entry.progressbar {
129 border-radius: 8px;
130 border-width: 0;
131@@ -233,14 +253,22 @@
132 }
133
134 .primary-toolbar GtkComboBox.combobox-entry .entry:first-child,
135-.primary-toolbar GtkComboBox.combobox-entry .button:first-child {
136+.primary-toolbar GtkComboBox.combobox-entry .button:first-child,
137+.menubar.toolbar GtkComboBox.combobox-entry .entry:first-child,
138+.menubar.toolbar GtkComboBox.combobox-entry .button:first-child,
139+.header-bar GtkComboBox.combobox-entry .entry:first-child,
140+.header-bar GtkComboBox.combobox-entry .button:first-child {
141 border-image-width: 10px 0 10px 12px;
142 border-radius: 8px 0 0 8px;
143 border-right-width: 0;
144 }
145
146 .primary-toolbar GtkComboBox.combobox-entry .entry:last-child,
147-.primary-toolbar GtkComboBox.combobox-entry .button:last-child {
148+.primary-toolbar GtkComboBox.combobox-entry .button:last-child,
149+.menubar.toolbar GtkComboBox.combobox-entry .entry:last-child,
150+.menubar.toolbar GtkComboBox.combobox-entry .button:last-child,
151+.header-bar GtkComboBox.combobox-entry .entry:last-child,
152+.header-bar GtkComboBox.combobox-entry .button:last-child {
153 border-image-width: 10px 12px 10px 0;
154 border-radius: 0 8px 8px 0;
155 border-left-width: 0;
156@@ -265,6 +293,22 @@
157 .primary-toolbar .raised .button:active,
158 .primary-toolbar .button.raised:insensitive,
159 .primary-toolbar .raised .button:insensitive,
160+.menubar.toolbar .entry,
161+.menubar.toolbar GtkComboBox.combobox-entry .entry,
162+.menubar.toolbar GtkComboBox.combobox-entry .button,
163+.menubar.toolbar .button:active,
164+.menubar.toolbar .button.raised:active,
165+.menubar.toolbar .raised .button:active,
166+.menubar.toolbar .button.raised:insensitive,
167+.menubar.toolbar .raised .button:insensitive,
168+.header-bar .entry,
169+.header-bar GtkComboBox.combobox-entry .entry,
170+.header-bar GtkComboBox.combobox-entry .button,
171+.header-bar .button:active,
172+.header-bar .button.raised:active,
173+.header-bar .raised .button:active,
174+.header-bar .button.raised:insensitive,
175+.header-bar .raised .button:insensitive,
176 .inline-toolbar.toolbar .button:active,
177 .inline-toolbar.toolbar .button:insensitive,
178 .inline-toolbar.toolbar GtkToolButton .button:active,
179@@ -272,7 +316,15 @@
180 .primary-toolbar GtkSwitch.trough,
181 .primary-toolbar GtkSwitch.trough:insensitive,
182 .primary-toolbar GtkComboBox .button:active,
183-.primary-toolbar GtkComboBox .button:insensitive {
184+.primary-toolbar GtkComboBox .button:insensitive,
185+.menubar.toolbar GtkSwitch.trough,
186+.menubar.toolbar GtkSwitch.trough:insensitive,
187+.menubar.toolbar GtkComboBox .button:active,
188+.menubar.toolbar GtkComboBox .button:insensitive,
189+.header-bar GtkSwitch.trough,
190+.header-bar GtkSwitch.trough:insensitive,
191+.header-bar GtkComboBox .button:active,
192+.header-bar GtkComboBox .button:insensitive {
193 }
194
195 /* primary toolbar - focused element borders */
196@@ -284,16 +336,40 @@
197 .primary-toolbar .raised .button:focus:active,
198 .primary-toolbar .button.raised.default:active,
199 .primary-toolbar .raised .button.default:active,
200+.menubar.toolbar .entry:focus,
201+.menubar.toolbar .button:active:focus,
202+.menubar.toolbar GtkComboBox.combobox-entry .entry:focus,
203+.menubar.toolbar GtkComboBox.combobox-entry .button:focus,
204+.menubar.toolbar .button.raised:focus:active,
205+.menubar.toolbar .raised .button:focus:active,
206+.menubar.toolbar .button.raised.default:active,
207+.menubar.toolbar .raised .button.default:active,
208+.header-bar .entry:focus,
209+.header-bar .button:active:focus,
210+.header-bar GtkComboBox.combobox-entry .entry:focus,
211+.header-bar GtkComboBox.combobox-entry .button:focus,
212+.header-bar .button.raised:focus:active,
213+.header-bar .raised .button:focus:active,
214+.header-bar .button.raised.default:active,
215+.header-bar .raised .button.default:active,
216 .inline-toolbar.toolbar .button:focus:active,
217 .inline-toolbar.toolbar .button.default:active,
218-.primary-toolbar GtkComboBox .button:active:focus {
219+.primary-toolbar GtkComboBox .button:active:focus,
220+.menubar.toolbar GtkComboBox .button:active:focus,
221+.header-bar GtkComboBox .button:active:focus {
222 }
223
224 /* primary toolbar - generic button borders */
225 .primary-toolbar .button.raised,
226 .primary-toolbar .raised .button,
227+.menubar.toolbar .button.raised,
228+.menubar.toolbar .raised .button,
229+.header-bar .button.raised,
230+.header-bar .raised .button,
231 .inline-toolbar.toolbar .button,
232-.primary-toolbar GtkComboBox .button {
233+.primary-toolbar GtkComboBox .button,
234+.menubar.toolbar GtkComboBox .button,
235+.header-bar GtkComboBox .button {
236 }
237
238 /* primary toolbar - focused button borders */
239@@ -301,9 +377,19 @@
240 .primary-toolbar .button.raised.default,
241 .primary-toolbar .raised .button:focus,
242 .primary-toolbar .raised .button.default,
243+.menubar.toolbar .button.raised:focus,
244+.menubar.toolbar .button.raised.default,
245+.menubar.toolbar .raised .button:focus,
246+.menubar.toolbar .raised .button.default,
247+.header-bar .button.raised:focus,
248+.header-bar .button.raised.default,
249+.header-bar .raised .button:focus,
250+.header-bar .raised .button.default,
251 .inline-toolbar.toolbar .button:focus,
252 .inline-toolbar.toolbar .button.default,
253-.primary-toolbar GtkComboBox .button:focus {
254+.primary-toolbar GtkComboBox .button:focus,
255+.menubar.toolbar GtkComboBox .button:focus,
256+.header-bar GtkComboBox .button:focus {
257 }
258
259 /* column-headers borders */
260@@ -398,11 +484,15 @@
261 border-image: url("assets/switch-trough-on.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
262 }
263
264-.primary-toolbar GtkSwitch.trough {
265+.primary-toolbar GtkSwitch.trough,
266+.menubar.toolbar GtkSwitch.trough,
267+.header-bar GtkSwitch.trough {
268 border-image: url("assets/switch-trough-toolbar-off.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
269 }
270
271-.primary-toolbar GtkSwitch.trough:active {
272+.primary-toolbar GtkSwitch.trough:active,
273+.menubar.toolbar GtkSwitch.trough:active,
274+.header-bar GtkSwitch.trough:active {
275 border-image: url("assets/switch-trough-toolbar-on.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
276 }
277
278
279=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
280--- Ambiance/gtk-3.0/gtk-widgets.css 2013-03-01 23:35:05 +0000
281+++ Ambiance/gtk-3.0/gtk-widgets.css 2013-07-28 23:09:26 +0000
282@@ -272,7 +272,17 @@
283 .primary-toolbar .linked .button,
284 .primary-toolbar .linked .button:active,
285 .primary-toolbar .linked .button:active:hover,
286-.primary-toolbar .linked .button:insensitive {
287+.primary-toolbar .linked .button:insensitive,
288+.menubar.toolbar .linked .entry,
289+.menubar.toolbar .linked .button,
290+.menubar.toolbar .linked .button:active,
291+.menubar.toolbar .linked .button:active:hover,
292+.menubar.toolbar .linked .button:insensitive,
293+.header-bar .linked .entry,
294+.header-bar .linked .button,
295+.header-bar .linked .button:active,
296+.header-bar .linked .button:active:hover,
297+.header-bar .linked .button:insensitive {
298 border-width: 1px;
299 border-right-width: 0;
300
301@@ -400,44 +410,86 @@
302 /* Set up shadows and hilights for button visual separation */
303 .primary-toolbar .linked .button,
304 .primary-toolbar .button.raised.linked,
305-.primary-toolbar .raised.linked .button {
306+.primary-toolbar .raised.linked .button,
307+.menubar.toolbar .linked .button,
308+.menubar.toolbar .button.raised.linked,
309+.menubar.toolbar .raised.linked .button,
310+.header-bar .linked .button,
311+.header-bar .button.raised.linked,
312+.header-bar .raised.linked .button {
313 box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4),
314 inset -1px 0 shade (@dark_bg_color, 0.9);
315 }
316
317 .primary-toolbar .linked .button:first-child,
318 .primary-toolbar .button.raised.linked:first-child,
319-.primary-toolbar .raised.linked .button:first-child {
320+.primary-toolbar .raised.linked .button:first-child,
321+.menubar.toolbar .linked .button:first-child,
322+.menubar.toolbar .button.raised.linked:first-child,
323+.menubar.toolbar .raised.linked .button:first-child,
324+.header-bar .linked .button:first-child,
325+.header-bar .button.raised.linked:first-child,
326+.header-bar .raised.linked .button:first-child {
327 box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9);
328 }
329
330 .primary-toolbar .linked .button:last-child,
331 .primary-toolbar .button.raised.linked:last-child,
332-.primary-toolbar .raised.linked .button:last-child {
333+.primary-toolbar .raised.linked .button:last-child,
334+.menubar.toolbar .linked .button:last-child,
335+.menubar.toolbar .button.raised.linked:last-child,
336+.menubar.toolbar .raised.linked .button:last-child,
337+.header-bar .linked .button:last-child,s
338+.header-bar .button.raised.linked:last-child,
339+.header-bar .raised.linked .button:last-child {
340 box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4)
341 }
342
343 .primary-toolbar .linked .button:active,
344 .primary-toolbar .button.raised.linked:active,
345-.primary-toolbar .raised.linked .button:active {
346+.primary-toolbar .raised.linked .button:active,
347+.menubar.toolbar .linked .button:active,
348+.menubar.toolbar .button.raised.linked:active
349+.menubar.toolbar .raised.linked .button:active,
350+.header-bar .linked .button:active,
351+.header-bar .button.raised.linked:active,
352+.header-bar .raised.linked .button:active {
353 box-shadow: inset 1px 0 shade (@dark_bg_color, 0.9);
354 }
355
356 .primary-toolbar .linked .button:insensitive,
357 .primary-toolbar .button.raised.linked:insensitive,
358-.primary-toolbar .raised.linked .button:insensitive {
359+.primary-toolbar .raised.linked .button:insensitive,
360+.menubar.toolbar .linked .button:insensitive,
361+.menubar.toolbar .button.raised.linked:insensitive,
362+.menubar.toolbar .raised.linked .button:insensitive,
363+.header-bar .linked .button:insensitive,
364+.header-bar .button.raised.linked:insensitive,
365+.header-bar .raised.linked .button:insensitive {
366 box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9);
367 }
368
369 .primary-toolbar .linked .button:backdrop:last-child,
370 .primary-toolbar .button.raised.linked:backdrop:last-child,
371-.primary-toolbar .raised.linked .button:backdrop:last-child {
372+.primary-toolbar .raised.linked .button:backdrop:last-child,
373+.menubar.toolbar .linked .button:backdrop:last-child,
374+.menubar.toolbar .button.raised.linked:backdrop:last-child,
375+.menubar.toolbar .raised.linked .button:backdrop:last-child,
376+.header-bar .linked .button:backdrop:last-child,
377+.header-bar .button.raised.linked:backdrop:last-child,
378+.header-bar .raised.linked .button:backdrop:last-child {
379 box-shadow: inset 1px 0 shade (@dark_bg_color, 1.2);
380 }
381
382 /*.primary-toolbar .linked .button:insensitive:backdrop,
383 .primary-toolbar .button.raised.linked:insensitive:backdrop,
384-.primary-toolbar .raised.linked .button:insensitive:backdrop {
385+.primary-toolbar .raised.linked .button:insensitive:backdrop,
386+.menubar.toolbar .linked .button:insensitive:backdrop,
387+.menubar.toolbar .button.raised.linked:insensitive:backdrop,
388+.menubar.toolbar .raised.linked .button:insensitive:backdrop,
389+.header-bar .linked .button:insensitive:backdrop,
390+.header-bar .button.raised.linked:insensitive:backdrop,
391+.header-bar .raised.linked .button:insensitive:backdrop {
392 box-shadow: inset -1px 0 @unfocused_insensitive_borders;
393 }*/
394
395@@ -447,7 +499,17 @@
396 .primary-toolbar .linked .button:only-child,
397 .primary-toolbar .linked .button:active:only-child,
398 .primary-toolbar .linked .button:active:hover:only-child,
399-.primary-toolbar .linked .button:insensitive:only-child {
400+.primary-toolbar .linked .button:insensitive:only-child,
401+.menubar.toolbar .linked .entry:only-child,
402+.menubar.toolbar .linked .button:only-child,
403+.menubar.toolbar .linked .button:active:only-child,
404+.menubar.toolbar .linked .button:active:hover:only-child,
405+.menubar.toolbar .linked .button:insensitive:only-child,
406+.header-bar .linked .entry:only-child,
407+.header-bar .linked .button:only-child,
408+.header-bar .linked .button:active:only-child,
409+.header-bar .linked .button:active:hover:only-child,
410+.header-bar .linked .button:insensitive:only-child {
411 border-radius: 8px;
412 box-shadow: none;
413 }
414@@ -692,6 +754,10 @@
415
416 .primary-toolbar .entry.progressbar,
417 .primary-toolbar .entry.progressbar,
418+.menubar.toolbar .entry.progressbar,
419+.menubar.toolbar .entry.progressbar,
420+.header-bar .entry.progressbar,
421+.header-bar .entry.progressbar,
422 .entry.progressbar {
423 background-image: -gtk-gradient (linear, left top, left bottom,
424 from (shade (@selected_bg_color, 0.8)),
425@@ -850,8 +916,12 @@
426 ********/
427 GtkTreeMenu.menu,
428 .toolbar .primary-toolbar .menu,
429+.toolbar .menubar.toolbar .menu,
430+.toolbar .header-bar .menu,
431 GtkMenuToolButton.menu,
432 .primary-toolbar .button .menu,
433+.menubar.toolbar .button .menu,
434+.header-bar .button .menu,
435 .menu {
436 background-image: none;
437 background-color: shade (@dark_bg_color, 1.08);
438@@ -902,7 +972,17 @@
439 .primary-toolbar .menu.button:active,
440 .primary-toolbar .menu.button:active:insensitive,
441 .primary-toolbar .menu.button:insensitive,
442-.primary-toolbar .menu.button */
443+.primary-toolbar .menu.button,
444+.menubar.toolbar .menu.button:hover,
445+.menubar.toolbar .menu.button:active,
446+.menubar.toolbar .menu.button:active:insensitive,
447+.menubar.toolbar .menu.button:insensitive,
448+.menubar.toolbar .menu.button,
449+.header-bar .menu.button:hover,
450+.header-bar .menu.button:active,
451+.header-bar .menu.button:active:insensitive,
452+.header-bar .menu.button:insensitive,
453+.header-bar .menu.button */
454 {
455 background-color: shade (@dark_bg_color, 1.08);
456 background-image: none;
457@@ -1015,10 +1095,18 @@
458 GtkTreeMenu.menu .menuitem *:insensitive,
459 .toolbar .primary-toolbar .menu .menuitem:insensitive,
460 .toolbar .primary-toolbar .menu .menuitem *:insensitive,
461+.toolbar .menubar.toolbar .menu .menuitem:insensitive,
462+.toolbar .menubar.toolbar .menu .menuitem *:insensitive,
463+.toolbar .header-bar .menu .menuitem:insensitive,
464+.toolbar .header-bar .menu .menuitem *:insensitive,
465 GtkMenuToolButton.menu .menuitem:insensitive,
466 GtkMenuToolButton.menu .menuitem *:insensitive,
467 .primary-toolbar .button .menu .menuitem:insensitive,
468 .primary-toolbar .button .menu .menuitem *:insensitive,
469+.menubar.toolbar .button .menu .menuitem:insensitive,
470+.menubar.toolbar .button .menu .menuitem *:insensitive,
471+.header-bar .button .menu .menuitem:insensitive,
472+.header-bar .button .menu .menuitem *:insensitive,
473 .menuitem:insensitive,
474 .menuitem *:insensitive {
475 color: mix (@dark_fg_color, @dark_bg_color, 0.5);
476@@ -1070,6 +1158,10 @@
477
478 .primary-toolbar GtkScale.trough,
479 .primary-toolbar GtkScale.trough:backdrop,
480+.menubar.toolbar GtkScale.trough,
481+.menubar.toolbar GtkScale.trough:backdrop,
482+.header-bar GtkScale.trough,
483+.header-bar GtkScale.trough:backdrop,
484 .menuitem GtkScale.trough {
485 background-color: @dark_bg_color;
486 background-image: none;
487@@ -1572,8 +1664,12 @@
488
489 GtkTreeMenu .menuitem.separator,
490 .toolbar .primary-toolbar .menuitem.separator,
491+.toolbar .menubar.toolbar .menuitem.separator,
492+.toolbar .header-bar .menuitem.separator,
493 GtkMenuToolButton .menuitem.separator,
494 .primary-toolbar .button .menuitem.separator,
495+.menubar.toolbar .button .menuitem.separator,
496+.header-bar .button .menuitem.separator,
497 .menuitem.separator {
498 border-color: shade (@dark_bg_color, 0.99);
499 border-bottom-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
500@@ -1754,7 +1850,11 @@
501
502 .menu.spinner,
503 .primary-toolbar .spinner,
504-.primary-toolbar .spinner {
505+.primary-toolbar .spinner,
506+.menubar.toolbar .spinner,
507+.menubar.toolbar .spinner,
508+.header-bar .spinner,
509+.header-bar .spinner {
510 color: @selected_bg_color;
511 }
512
513@@ -1846,7 +1946,9 @@
514 /* primary-toolbar */
515 .primary-toolbar,
516 .primary-toolbar .toolbar,
517-.primary-toolbar.toolbar {
518+.primary-toolbar.toolbar,
519+.menubar.toolbar,
520+.header-bar {
521 -GtkWidget-window-dragging: true;
522
523 background-image: -gtk-gradient (linear, left top, left bottom,
524@@ -1864,7 +1966,10 @@
525 }
526
527 .primary-toolbar .toolbar:backdrop,
528-.primary-toolbar.toolbar:backdrop {
529+.primary-toolbar.toolbar:backdrop,
530+.menubar.toolbar .toolbar:backdrop,
531+.menubar.toolbar.toolbar:backdrop,
532+.header-bar:backdrop {
533 background-image: none;
534 background-color: @dark_bg_color;
535 box-shadow: none;
536@@ -1874,12 +1979,18 @@
537 color: @backdrop_dark_fg_color;
538 }
539
540-.primary-toolbar :insensitive {
541+.primary-toolbar :insensitive,
542+.menubar.toolbar .toolbar :insensitive,
543+.header-bar :insensitive {
544 text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
545 }
546
547 .primary-toolbar GtkComboBox,
548-.primary-toolbar .button {
549+.primary-toolbar .button,
550+.menubar.toolbar GtkComboBox,
551+.menubar.toolbar .button,
552+.header-bar GtkComboBox,
553+.header-bar .button {
554 background-color: transparent;
555 background-image: none;
556 border-color: transparent;
557@@ -1892,7 +2003,11 @@
558 }
559
560 .primary-toolbar GtkComboBox:backdrop,
561-.primary-toolbar .button:backdrop {
562+.primary-toolbar .button:backdrop,
563+.menubar.toolbar GtkComboBox:backdrop,
564+.menubar.toolbar .button:backdrop,
565+.header-bar GtkComboBox:backdrop,
566+.header-bar .button:backdrop {
567 color: @backdrop_dark_fg_color;
568 text-shadow: 0 -1px shade (@dark_bg_color, 0.9);
569 }
570@@ -1901,7 +2016,17 @@
571 .primary-toolbar .raised.button,
572 .primary-toolbar .button:hover,
573 .primary-toolbar .button:active,
574-.primary-toolbar .button:insensitive {
575+.primary-toolbar .button:insensitive,
576+.menubar.toolbar .raised .button,
577+.menubar.toolbar .raised.button,
578+.menubar.toolbar .button:hover,
579+.menubar.toolbar .button:active,
580+.menubar.toolbar .button:insensitive,
581+.header-bar .raised .button,
582+.header-bar .raised.button,
583+.header-bar .button:hover,
584+.header-bar .button:active,
585+.header-bar .button:insensitive {
586 background-image: -gtk-gradient (linear, left top, left bottom,
587 from (shade (@dark_bg_color, 1.2)),
588 to (shade (@dark_bg_color, 1.1)));
589@@ -1912,19 +2037,36 @@
590 .primary-toolbar .raised.button:focus,
591 .primary-toolbar .button:hover:focus,
592 .primary-toolbar .button:active:focus,
593-.primary-toolbar .button:insensitive:focus {
594-}
595-
596-.primary-toolbar GtkComboBox.combobox-entry .button {
597+.primary-toolbar .button:insensitive:focus,
598+.menubar.toolbar .raised .button:focus,
599+.menubar.toolbar .raised.button:focus,
600+.menubar.toolbar .button:hover:focus,
601+.menubar.toolbar .button:active:focus,
602+.menubar.toolbar .button:insensitive:focus,
603+.header-bar .raised .button:focus,
604+.header-bar .raised.button:focus,
605+.header-bar .button:hover:focus,
606+.header-bar .button:active:focus,
607+.header-bar .button:insensitive:focus {
608 }
609
610 .primary-toolbar GtkComboBox.combobox-entry .button,
611 .primary-toolbar .raised .button,
612 .primary-toolbar .raised.button,
613-.primary-toolbar .button:hover {
614+.primary-toolbar .button:hover,
615+.menubar.toolbar GtkComboBox.combobox-entry .button,
616+.menubar.toolbar .raised .button,
617+.menubar.toolbar .raised.button,
618+.menubar.toolbar .button:hover,
619+.header-bar GtkComboBox.combobox-entry .button,
620+.header-bar .raised .button,
621+.header-bar .raised.button,
622+.header-bar .button:hover {
623 }
624
625-.primary-toolbar .button:active {
626+.primary-toolbar .button:active,
627+.menubar.toolbar .button:active,
628+.header-bar .button:active {
629 background-image: -gtk-gradient (linear, left top, left bottom,
630 from (shade (@dark_bg_color, 0.9)),
631 to (shade (@dark_bg_color, 0.95)));
632@@ -1932,24 +2074,34 @@
633 text-shadow: 0 -1px shade (@dark_bg_color, 0.6);
634 }
635
636-.primary-toolbar .button:active:hover {
637+.primary-toolbar .button:active:hover,
638+.menubar.toolbar .button:active:hover,
639+.header-bar .button:active:hover {
640 background-image: -gtk-gradient (linear, left top, left bottom,
641 from (shade (@dark_bg_color, 0.95)),
642 to (shade (@dark_bg_color, 1.0)));
643 }
644
645 .primary-toolbar .button:active:insensitive,
646-.primary-toolbar .button:insensitive {
647+.primary-toolbar .button:insensitive,
648+.menubar.toolbar .button:active:insensitive,
649+.menubar.toolbar .button:insensitive,
650+.header-bar .button:active:insensitive,
651+.header-bar .button:insensitive {
652 text-shadow: none;
653 }
654
655-.primary-toolbar .button:insensitive {
656+.primary-toolbar .button:insensitive,
657+.menubar.toolbar .button:insensitive,
658+.header-bar .button:insensitive {
659 background-image: -gtk-gradient (linear, left top, left bottom,
660 from (shade (@dark_bg_color, 1.01)),
661 to (shade (@dark_bg_color, 0.99)));
662 }
663
664-.primary-toolbar .button:active:insensitive {
665+.primary-toolbar .button:active:insensitive,
666+.menubar.toolbar .button:active:insensitive,
667+.header-bar .button:active:insensitive {
668 background-image: -gtk-gradient (linear, left top, left bottom,
669 from (shade (@dark_bg_color, 0.94)),
670 to (shade (@dark_bg_color, 1.02)));
671@@ -1957,7 +2109,13 @@
672
673 .primary-toolbar .entry,
674 .primary-toolbar .entry:active,
675-.primary-toolbar .entry:focused {
676+.primary-toolbar .entry:focused,
677+.menubar.toolbar .entry,
678+.menubar.toolbar .entry:active,
679+.menubar.toolbar .entry:focused,
680+.header-bar .entry,
681+.header-bar .entry:active,
682+.header-bar .entry:focused {
683 border-radius: 9px;
684
685 /* background-color: @dark_bg_color;
686@@ -1968,7 +2126,13 @@
687
688 .primary-toolbar GtkSeparatorToolItem,
689 .primary-toolbar .separator,
690-.primary-toolbar .separator:insensitive {
691+.primary-toolbar .separator:insensitive,
692+.menubar.toolbar GtkSeparatorToolItem,
693+.menubar.toolbar .separator,
694+.menubar.toolbar .separator:insensitive,
695+.header-bar GtkSeparatorToolItem,
696+.header-bar .separator,
697+.header-bar .separator:insensitive {
698 border-color: alpha (shade (@dark_bg_color, 0.94), 0.35);
699 border-bottom-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
700 border-right-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
701@@ -2017,6 +2181,42 @@
702 .primary-toolbar .raised.linked .button:focus:active,
703 .primary-toolbar .raised.linked .button:insensitive,
704 .primary-toolbar .raised.linked .button:backdrop,
705+.menubar.toolbar .linked .button,
706+.menubar.toolbar .linked .button:active,
707+.menubar.toolbar .linked .button:focus,
708+.menubar.toolbar .linked .button:focus:active,
709+.menubar.toolbar .linked .button:hover,
710+.menubar.toolbar .linked .button:hover:active,
711+.menubar.toolbar .linked .button:insensitive,
712+.menubar.toolbar .linked .button:backdrop,
713+.menubar.toolbar .linked .entry,
714+.menubar.toolbar .linked .entry:active,
715+.menubar.toolbar .linked .entry:focused,
716+.menubar.toolbar .linked .entry:focused:active,
717+.menubar.toolbar .linked .entry:insensitive,
718+.menubar.toolbar .raised.linked .button,
719+.menubar.toolbar .raised.linked .button:active,
720+.menubar.toolbar .raised.linked .button:focus,
721+.menubar.toolbar .raised.linked .button:focus:active,
722+.menubar.toolbar .raised.linked .button:insensitive,
723+.menubar.toolbar .raised.linked .button:backdrop,
724+.header-bar .linked .button,
725+.header-bar .linked .button:active,
726+.header-bar .linked .button:focus,
727+.header-bar .linked .button:focus:active,
728+.header-bar .linked .button:insensitive,
729+.header-bar .linked .button:backdrop,
730+.header-bar .linked .entry,
731+.header-bar .linked .entry:active,
732+.header-bar .linked .entry:focused,
733+.header-bar .linked .entry:focused:active,
734+.header-bar .linked .entry:insensitive,
735+.header-bar .raised.linked .button,
736+.header-bar .raised.linked .button:active,
737+.header-bar .raised.linked .button:focus,
738+.header-bar .raised.linked .button:focus:active,
739+.header-bar .raised.linked .button:insensitive,
740+.header-bar .raised.linked .button:backdrop,
741 .inline-toolbar.toolbar .button,
742 .inline-toolbar.toolbar .button:active,
743 .inline-toolbar.toolbar .button:focus,
744@@ -2050,6 +2250,40 @@
745 .primary-toolbar .raised.linked .button:focus:active:first-child,
746 .primary-toolbar .raised.linked .button:insensitive:first-child,
747 .primary-toolbar .raised.linked .button:backdrop:first-child,
748+.menubar.toolbar .linked .button:first-child,
749+.menubar.toolbar .linked .button:active:first-child,
750+.menubar.toolbar .linked .button:focus:first-child,
751+.menubar.toolbar .linked .button:focus:active:first-child,
752+.menubar.toolbar .linked .button:insensitive:first-child,
753+.menubar.toolbar .linked .button:backdrop:first-child,
754+.menubar.toolbar .linked .entry:first-child,
755+.menubar.toolbar .linked .entry:active:first-child,
756+.menubar.toolbar .linked .entry:focused:first-child,
757+.menubar.toolbar .linked .entry:focused:active:first-child,
758+.menubar.toolbar .linked .entry:insensitive:first-child,
759+.menubar.toolbar .raised.linked .button:first-child,
760+.menubar.toolbar .raised.linked .button:active:first-child,
761+.menubar.toolbar .raised.linked .button:focus:first-child,
762+.menubar.toolbar .raised.linked .button:focus:active:first-child,
763+.menubar.toolbar .raised.linked .button:insensitive:first-child,
764+.menubar.toolbar .raised.linked .button:backdrop:first-child,
765+.header-bar .linked .button:first-child,
766+.header-bar .linked .button:active:first-child,
767+.header-bar .linked .button:focus:first-child,
768+.header-bar .linked .button:focus:active:first-child,
769+.header-bar .linked .button:insensitive:first-child,
770+.header-bar .linked .button:backdrop:first-child,
771+.header-bar .linked .entry:first-child,
772+.header-bar .linked .entry:active:first-child,
773+.header-bar .linked .entry:focused:first-child,
774+.header-bar .linked .entry:focused:active:first-child,
775+.header-bar .linked .entry:insensitive:first-child,
776+.header-bar .raised.linked .button:first-child,
777+.header-bar .raised.linked .button:active:first-child,
778+.header-bar .raised.linked .button:focus:first-child,
779+.header-bar .raised.linked .button:focus:active:first-child,
780+.header-bar .raised.linked .button:insensitive:first-child,
781+.header-bar .raised.linked .button:backdrop:first-child,
782 .inline-toolbar.toolbar .button:first-child,
783 .inline-toolbar.toolbar .button:active:first-child,
784 .inline-toolbar.toolbar .button:focus:first-child,
785@@ -2085,6 +2319,40 @@
786 .primary-toolbar .raised.linked .button:focus:active:last-child,
787 .primary-toolbar .raised.linked .button:insensitive:last-child,
788 .primary-toolbar .raised.linked .button:backdrop:last-child,
789+.menubar.toolbar .linked .button:last-child,
790+.menubar.toolbar .linked .button:active:last-child,
791+.menubar.toolbar .linked .button:focus:last-child,
792+.menubar.toolbar .linked .button:focus:active:last-child,
793+.menubar.toolbar .linked .button:insensitive:last-child,
794+.menubar.toolbar .linked .button:backdrop:last-child,
795+.menubar.toolbar .linked .entry:last-child,
796+.menubar.toolbar .linked .entry.active:last-child,
797+.menubar.toolbar .linked .entry:focused:last-child,
798+.menubar.toolbar .linked .entry:focused:active:last-child,
799+.menubar.toolbar .linked .entry:insensitive:last-child,
800+.menubar.toolbar .linked .raised.linked .button:last-child,
801+.menubar.toolbar .linked .raised.linked .button:active:last-child,
802+.menubar.toolbar .linked .raised.linked .button:focus:last-child,
803+.menubar.toolbar .linked .raised.linked .button:focus:active:last-child,
804+.menubar.toolbar .linked .raised.linked .button:insensitive:last-child,
805+.menubar.toolbar .linked .raised.linked .button:backdrop:last-child,
806+.header-bar .linked .button:last-child,
807+.header-bar .linked .button:active:last-child,
808+.header-bar .linked .button:focus:last-child,
809+.header-bar .linked .button:focus:active:last-child,
810+.header-bar .linked .button:insensitive:last-child,
811+.header-bar .linked .button:backdrop:last-child,
812+.header-bar .linked .entry:last-child,
813+.header-bar .linked .entry.active:last-child,
814+.header-bar .linked .entry:focused:last-child,
815+.header-bar .linked .entry:focused:active:last-child,
816+.header-bar .linked .entry:insensitive:last-child,
817+.header-bar .linked .raised.linked .button:last-child,
818+.header-bar .linked .raised.linked .button:active:last-child,
819+.header-bar .linked .raised.linked .button:focus:last-child,
820+.header-bar .linked .raised.linked .button:focus:active:last-child,
821+.header-bar .linked .raised.linked .button:insensitive:last-child,
822+.header-bar .linked .raised.linked .button:backdrop:last-child,
823 .inline-toolbar.toolbar .button:last-child,
824 .inline-toolbar.toolbar .button:active:last-child,
825 .inline-toolbar.toolbar .button:focus:last-child,
826@@ -2123,6 +2391,34 @@
827 .primary-toolbar.toolbar GtkToolButton:only-child .button:insensitive,
828 .primary-toolbar.toolbar GtkToolButton:only-child .button:backdrop,
829 .primary-toolbar.toolbar GtkToolButton:only-child .button:backdrop:insensitive,
830+.menubar.toolbar.toolbar .button:only-child,
831+.menubar.toolbar.toolbar .button:active:only-child,
832+.menubar.toolbar.toolbar .button:focus:only-child,
833+.menubar.toolbar.toolbar .button:focus:active:only-child,
834+.menubar.toolbar.toolbar .button:insensitive:only-child,
835+.menubar.toolbar.toolbar .button:backdrop:only-child,
836+.menubar.toolbar.toolbar .button:backdrop:insensitive:only-child,
837+.menubar.toolbar.toolbar GtkToolButton:only-child .button,
838+.menubar.toolbar.toolbar GtkToolButton:only-child .button:active,
839+.menubar.toolbar.toolbar GtkToolButton:only-child .button:focus,
840+.menubar.toolbar.toolbar GtkToolButton:only-child .button:focus:active,
841+.menubar.toolbar.toolbar GtkToolButton:only-child .button:insensitive,
842+.menubar.toolbar.toolbar GtkToolButton:only-child .button:backdrop,
843+.menubar.toolbar.toolbar GtkToolButton:only-child .button:backdrop:insensitive,
844+.header-bar .button:only-child,
845+.header-bar .button:active:only-child,
846+.header-bar .button:focus:only-child,
847+.header-bar .button:focus:active:only-child,
848+.header-bar .button:insensitive:only-child,
849+.header-bar .button:backdrop:only-child,
850+.header-bar .button:backdrop:insensitive:only-child,
851+.header-bar GtkToolButton:only-child .button,
852+.header-bar GtkToolButton:only-child .button:active,
853+.header-bar GtkToolButton:only-child .button:focus,
854+.header-bar GtkToolButton:only-child .button:focus:active,
855+.header-bar GtkToolButton:only-child .button:insensitive,
856+.header-bar GtkToolButton:only-child .button:backdrop,
857+.header-bar GtkToolButton:only-child .button:backdrop:insensitive,
858 .inline-toolbar.toolbar .button:only-child,
859 .inline-toolbar.toolbar .button:active:only-child,
860 .inline-toolbar.toolbar .button:focus:only-child,
861
862=== modified file 'Radiance/gtk-3.0/gtk-widgets-assets.css'
863--- Radiance/gtk-3.0/gtk-widgets-assets.css 2012-10-10 11:38:40 +0000
864+++ Radiance/gtk-3.0/gtk-widgets-assets.css 2013-07-28 23:09:26 +0000
865@@ -383,16 +383,22 @@
866 }*/
867
868 .primary-toolbar .menu .check,
869+.menubar.toolbar .menu .check,
870+.header-bar .menu .check,
871 .menu .check {
872 background-image: url("assets/check-menuitem-unselected.png");
873 }
874
875 .primary-toolbar .menu .radio,
876+.menubar.toolbar .menu .radio,
877+.header-bar .menu .radio,
878 .menu .radio {
879 background-image: url("assets/check-menuitem-unselected.png");
880 }
881
882 .primary-toolbar .menu .check:active,
883+.menubar.toolbar .menu .check:active,
884+.header-bar .menu .check:active,
885 .toolbar .menu .check:active:hover,
886 .menu .check:active,
887 .menu .check:active:hover {
888@@ -400,6 +406,8 @@
889 }
890
891 .primary-toolbar .menu .check:active:insensitive,
892+.menubar.toolbar .menu .check:active:insensitive,
893+.header-bar .menu .check:active:insensitive,
894 .toolbar .menu .check:active:hover:insensitive,
895 .menu .check:active:insensitive,
896 .menu .check:active:hover:insensitive {
897@@ -407,6 +415,8 @@
898 }
899
900 .primary-toolbar .menu .radio:active,
901+.menubar.toolbar .menu .radio:active,
902+.header-bar .menu .radio:active,
903 .toolbar .menu .radio:active:hover,
904 .menu .radio:active,
905 .menu .radio:active:hover {
906@@ -414,6 +424,8 @@
907 }
908
909 .primary-toolbar .menu .radio:active:insensitive,
910+.menubar.toolbar .menu .radio:active:insensitive,
911+.header-bar .menu .radio:active:insensitive,
912 .toolbar .menu .radio:active:hover:insensitive,
913 .menu .radio:active:insensitive,
914 .menu .radio:active:hover:insensitive {
915
916=== modified file 'Radiance/gtk-3.0/gtk-widgets-backdrop.css'
917--- Radiance/gtk-3.0/gtk-widgets-backdrop.css 2012-08-08 13:46:38 +0000
918+++ Radiance/gtk-3.0/gtk-widgets-backdrop.css 2013-07-28 23:09:26 +0000
919@@ -250,7 +250,17 @@
920 .primary-toolbar .linked .button:backdrop,
921 .primary-toolbar .linked .button:active:backdrop,
922 .primary-toolbar .linked .button:active:hover:backdrop,
923-.primary-toolbar .linked .button:insensitive:backdrop {
924+.primary-toolbar .linked .button:insensitive:backdrop,
925+.menubar.toolbar .linked .entry:backdrop,
926+.menubar.toolbar .linked .button:backdrop,
927+.menubar.toolbar .linked .button:active:backdrop,
928+.menubar.toolbar .linked .button:active:hover:backdrop,
929+.menubar.toolbar .linked .button:insensitive:backdrop,
930+.header-bar .linked .entry:backdrop,
931+.header-bar .linked .button:backdrop,
932+.header-bar .linked .button:active:backdrop,
933+.header-bar .linked .button:active:hover:backdrop,
934+.header-bar .linked .button:insensitive:backdrop {
935 border-width: 1px;
936 border-right-width: 0;
937
938@@ -269,7 +279,17 @@
939 .primary-toolbar .linked .button:first-child:backdrop,
940 .primary-toolbar .linked .button:active:first-child:backdrop,
941 .primary-toolbar .linked .button:active:hover:first-child:backdrop,
942-.primary-toolbar .linked .button:insensitive:first-child:backdrop {
943+.primary-toolbar .linked .button:insensitive:first-child:backdrop,
944+.menubar.toolbar .linked .entry:first-child:backdrop,
945+.menubar.toolbar .linked .button:first-child:backdrop,
946+.menubar.toolbar .linked .button:active:first-child:backdrop,
947+.menubar.toolbar .linked .button:active:hover:first-child:backdrop,
948+.menubar.toolbar .linked .button:insensitive:first-child:backdrop,
949+.header-bar .linked .entry:first-child:backdrop,
950+.header-bar .linked .button:first-child:backdrop,
951+.header-bar .linked .button:active:first-child:backdrop,
952+.header-bar .linked .button:active:hover:first-child:backdrop,
953+.header-bar .linked .button:insensitive:first-child:backdrop {
954 border-width: 1px;
955 border-right-width: 0;
956
957@@ -290,7 +310,17 @@
958 .primary-toolbar .linked .button:last-child:backdrop,
959 .primary-toolbar .linked .button:active:last-child:backdrop,
960 .primary-toolbar .linked .button:active:hover:last-child:backdrop,
961-.primary-toolbar .linked .button:insensitive:last-child:backdrop {
962+.primary-toolbar .linked .button:insensitive:last-child:backdrop,
963+.menubar.toolbar .linked .entry:last-child:backdrop,
964+.menubar.toolbar .linked .button:last-child:backdrop,
965+.menubar.toolbar .linked .button:active:last-child:backdrop,
966+.menubar.toolbar .linked .button:active:hover:last-child:backdrop,
967+.menubar.toolbar .linked .button:insensitive:last-child:backdrop,
968+.header-bar .linked .entry:last-child:backdrop,
969+.header-bar .linked .button:last-child:backdrop,
970+.header-bar .linked .button:active:last-child:backdrop,
971+.header-bar .linked .button:active:hover:last-child:backdrop,
972+.header-bar .linked .button:insensitive:last-child:backdrop {
973 border-width: 1px;
974
975 border-radius: 3px;
976@@ -310,7 +340,17 @@
977 .primary-toolbar .linked .button:only-child:backdrop,
978 .primary-toolbar .linked .button:active:only-child:backdrop,
979 .primary-toolbar .linked .button:active:hover:only-child:backdrop,
980-.primary-toolbar .linked .button:insensitive:only-child:backdrop {
981+.primary-toolbar .linked .button:insensitive:only-child:backdrop,
982+.menubar.toolbar .linked .entry:only-child:backdrop,
983+.menubar.toolbar .linked .button:only-child:backdrop,
984+.menubar.toolbar .linked .button:active:only-child:backdrop,
985+.menubar.toolbar .linked .button:active:hover:only-child:backdrop,
986+.menubar.toolbar .linked .button:insensitive:only-child:backdrop,
987+.header-bar .linked .entry:only-child:backdrop,
988+.header-bar .linked .button:only-child:backdrop,
989+.header-bar .linked .button:active:only-child:backdrop,
990+.header-bar .linked .button:active:hover:only-child:backdrop,
991+.header-bar .linked .button:insensitive:only-child:backdrop {
992 border-width: 1px;
993
994 border-radius: 3px;
995@@ -592,6 +632,10 @@
996
997 .primary-toolbar .entry.progressbar:backdrop,
998 .primary-toolbar .entry.progressbar:backdrop,
999+.menubar.toolbar .entry.progressbar:backdrop,
1000+.menubar.toolbar .entry.progressbar:backdrop,
1001+.header-bar .entry.progressbar:backdrop,
1002+.header-bar .entry.progressbar:backdrop,
1003 .entry.progressbar:backdrop {
1004 }
1005
1006@@ -839,7 +883,9 @@
1007 }
1008
1009 .menubar .menuitem.separator:backdrop,
1010-.primary-toolbar .menuitem.separator:backdrop {
1011+.primary-toolbar .menuitem.separator:backdrop,
1012+.menubar.toolbar .menuitem.separator:backdrop,
1013+.header-bar .menuitem.separator:backdrop {
1014 }
1015
1016 /***********
1017@@ -897,7 +943,11 @@
1018 ***********/
1019 .menu.spinner:backdrop,
1020 .primary-toolbar .spinner:backdrop,
1021-.primary-toolbar .spinner:backdrop {
1022+.primary-toolbar .spinner:backdrop,
1023+.menubar.toolbar .spinner:backdrop,
1024+.menubar.toolbar .spinner:backdrop,
1025+.header-bar .spinner:backdrop,
1026+.header-bar .spinner:backdrop {
1027 color: @backdrop_selected_bg_color;
1028 }
1029
1030@@ -1003,7 +1053,11 @@
1031 /* primary-toolbar */
1032 .primary-toolbar:backdrop,
1033 .primary-toolbar .toolbar:backdrop,
1034-.primary-toolbar.toolbar:backdrop {
1035+.primary-toolbar.toolbar:backdrop,
1036+.menubar.toolbar .toolbar:backdrop,
1037+.menubar.toolbar.toolbar:backdrop,
1038+.header-bar .toolbar:backdrop,
1039+.header-bar.toolbar:backdrop {
1040 background-color: @dark_bg_color;
1041 background-image: none;
1042 border-bottom-color: shade (@dark_bg_color, 0.94);
1043@@ -1019,13 +1073,21 @@
1044 -unico-inner-stroke-width: 0;
1045 }
1046
1047-.primary-toolbar :insensitive:backdrop {
1048+.primary-toolbar :insensitive:backdrop,
1049+.menubar.toolbar :insensitive:backdrop,
1050+.header-bar :insensitive:backdrop {
1051 text-shadow: 0 -1px shade (@dark_bg_color, 0.82);
1052 }
1053
1054 .primary-toolbar GtkComboBox:backdrop,
1055 .primary-toolbar .button *:backdrop,
1056-.primary-toolbar .button:backdrop {
1057+.primary-toolbar .button:backdrop,
1058+.menubar.toolbar GtkComboBox:backdrop,
1059+.menubar.toolbar .button *:backdrop,
1060+.menubar.toolbar .button:backdrop,
1061+.header-bar GtkComboBox:backdrop,
1062+.header-bar .button *:backdrop,
1063+.header-bar .button:backdrop {
1064 background-color: @transparent;
1065 background-image: none;
1066 border-color: @transparent;
1067@@ -1050,7 +1112,9 @@
1068 -unico-outer-stroke-width: 0;
1069 }
1070
1071-.primary-toolbar .button *:hover:backdrop {
1072+.primary-toolbar .button *:hover:backdrop,
1073+.menubar.toolbar .button *:hover:backdrop,
1074+.header-bar .button *:hover:backdrop {
1075 color: shade (shade (#a39e9a, 0.86), 1.1);
1076 }
1077
1078@@ -1058,7 +1122,17 @@
1079 .primary-toolbar .raised.button:backdrop,
1080 .primary-toolbar .button:hover:backdrop,
1081 .primary-toolbar .button:active:backdrop,
1082-.primary-toolbar .button:insensitive:backdrop {
1083+.primary-toolbar .button:insensitive:backdrop,
1084+.menubar.toolbar .raised .button:backdrop,
1085+.menubar.toolbar .raised.button:backdrop,
1086+.menubar.toolbar .button:hover:backdrop,
1087+.menubar.toolbar .button:active:backdrop,
1088+.menubar.toolbar .button:insensitive:backdrop,
1089+.header-bar .raised .button:backdrop,
1090+.header-bar .raised.button:backdrop,
1091+.header-bar .button:hover:backdrop,
1092+.header-bar .button:active:backdrop,
1093+.header-bar .button:insensitive:backdrop {
1094 border-width: 1px;
1095
1096 /* This breaks Gtk+ 3.5.x, lp #1015497. */
1097@@ -1076,7 +1150,9 @@
1098 -unico-outer-stroke-width: 1px;
1099 }
1100
1101-.primary-toolbar GtkComboBox.combobox-entry .button:backdrop {
1102+.primary-toolbar GtkComboBox.combobox-entry .button:backdrop,
1103+.menubar.toolbar GtkComboBox.combobox-entry .button:backdrop,
1104+.header-bar GtkComboBox.combobox-entry .button:backdrop {
1105 -unico-inner-stroke-width: 1px;
1106 -unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
1107 from (shade (@dark_bg_color, 1.01)),
1108@@ -1086,7 +1162,15 @@
1109 .primary-toolbar GtkComboBox.combobox-entry .button:backdrop,
1110 .primary-toolbar .raised .button:backdrop,
1111 .primary-toolbar .raised.button:backdrop,
1112-.primary-toolbar .button:hover:backdrop {
1113+.primary-toolbar .button:hover:backdrop,
1114+.menubar.toolbar GtkComboBox.combobox-entry .button:backdrop,
1115+.menubar.toolbar .raised .button:backdrop,
1116+.menubar.toolbar .raised.button:backdrop,
1117+.menubar.toolbar .button:hover:backdrop,
1118+.header-bar GtkComboBox.combobox-entry .button:backdrop,
1119+.header-bar .raised .button:backdrop,
1120+.header-bar .raised.button:backdrop,
1121+.header-bar .button:hover:backdrop {
1122 background-image: -gtk-gradient (linear, left top, left bottom,
1123 from (shade (@dark_bg_color, 1.06)),
1124 to (shade (@dark_bg_color, 0.98)));
1125@@ -1100,7 +1184,9 @@
1126 to (shade (@dark_bg_color, 1.02)));
1127 }
1128
1129-.primary-toolbar .button:active:backdrop {
1130+.primary-toolbar .button:active:backdrop,
1131+.menubar.toolbar .button:active:backdrop,
1132+.header-bar .button:active:backdrop {
1133 background-image: -gtk-gradient (linear, left top, left bottom,
1134 from (shade (@dark_bg_color, 0.9)),
1135 to (shade (@dark_bg_color, 0.95)));
1136@@ -1115,7 +1201,9 @@
1137 to (shade (@dark_bg_color, 0.93)))
1138 }
1139
1140-.primary-toolbar .button:active:hover:backdrop {
1141+.primary-toolbar .button:active:hover:backdrop,
1142+.menubar.toolbar .button:active:hover:backdrop,
1143+.header-bar .button:active:hover:backdrop {
1144 background-image: -gtk-gradient (linear, left top, left bottom,
1145 from (shade (@dark_bg_color, 0.95)),
1146 to (shade (@dark_bg_color, 1.0)));
1147@@ -1129,7 +1217,11 @@
1148 }
1149
1150 .primary-toolbar .button:active:insensitive:backdrop,
1151-.primary-toolbar .button:insensitive:backdrop {
1152+.primary-toolbar .button:insensitive:backdrop,
1153+.menubar.toolbar .button:active:insensitive:backdrop,
1154+.menubar.toolbar .button:insensitive:backdrop,
1155+.header-bar .button:active:insensitive:backdrop,
1156+.header-bar .button:insensitive:backdrop {
1157 text-shadow: none;
1158
1159 -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
1160@@ -1141,7 +1233,9 @@
1161 to (shade (@dark_bg_color, 1.06)));
1162 }
1163
1164-.primary-toolbar .button:insensitive:backdrop {
1165+.primary-toolbar .button:insensitive:backdrop,
1166+.menubar.toolbar .button:insensitive:backdrop,
1167+.header-bar .button:insensitive:backdrop {
1168 background-image: -gtk-gradient (linear, left top, left bottom,
1169 from (shade (@dark_bg_color, 1.01)),
1170 to (shade (@dark_bg_color, 0.99)));
1171@@ -1151,7 +1245,9 @@
1172 to (shade (@dark_bg_color, 1.04)));
1173 }
1174
1175-.primary-toolbar .button:active:insensitive:backdrop {
1176+.primary-toolbar .button:active:insensitive:backdrop,
1177+.menubar.toolbar .button:active:insensitive:backdrop,
1178+.header-bar .button:active:insensitive:backdrop {
1179 background-image: -gtk-gradient (linear, left top, left bottom,
1180 from (shade (@dark_bg_color, 0.94)),
1181 to (shade (@dark_bg_color, 1.02)));
1182@@ -1163,7 +1259,13 @@
1183
1184 .primary-toolbar .entry:backdrop,
1185 .primary-toolbar .entry:active:backdrop,
1186-.primary-toolbar .entry:focused:backdrop {
1187+.primary-toolbar .entry:focused:backdrop,
1188+.menubar.toolbar .entry:backdrop,
1189+.menubar.toolbar .entry:active:backdrop,
1190+.menubar.toolbar .entry:focused:backdrop,
1191+.header-bar .entry:backdrop,
1192+.header-bar .entry:active:backdrop,
1193+.header-bar .entry:focused:backdrop {
1194 border-radius: 3px;
1195
1196 color: @text_color;
1197@@ -1174,7 +1276,9 @@
1198 to (shade (@dark_bg_color, 1.06)));
1199 }
1200
1201-.primary-toolbar .entry:backdrop {
1202+.primary-toolbar .entry:backdrop,
1203+.menubar.toolbar .entry:backdrop,
1204+.header-bar .entry:backdrop {
1205 -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
1206 from (shade (@dark_bg_color, 0.75)),
1207 to (shade (@dark_bg_color, 0.95)));
1208@@ -1183,14 +1287,18 @@
1209 to (alpha (shade (@bg_color, 0.05), 0.01)));
1210 }
1211
1212-.primary-toolbar .entry:insensitive:backdrop {
1213+.primary-toolbar .entry:insensitive:backdrop,
1214+.menubar.toolbar .entry:insensitive:backdrop,
1215+.header-bar .entry:insensitive:backdrop {
1216 -unico-outer-stroke-width: 1px;
1217 -unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
1218 from (shade (@dark_bg_color, 1.01)),
1219 to (shade (@dark_bg_color, 1.06)));
1220 }
1221
1222-.primary-toolbar .entry:focused:backdrop {
1223+.primary-toolbar .entry:focused:backdrop,
1224+.menubar.toolbar .entry:focused:backdrop,
1225+.header-bar .entry:focused:backdrop {
1226 -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
1227 from (shade (@backdrop_selected_bg_color, 0.75)),
1228 to (shade (@backdrop_selected_bg_color, 0.8)));
1229@@ -1200,7 +1308,13 @@
1230
1231 .primary-toolbar GtkSeparatorToolItem:backdrop,
1232 .primary-toolbar .separator:backdrop,
1233-.primary-toolbar .separator:insensitive:backdrop {
1234+.primary-toolbar .separator:insensitive:backdrop,
1235+.menubar.toolbar GtkSeparatorToolItem:backdrop,
1236+.menubar.toolbar .separator:backdrop,
1237+.menubar.toolbar .separator:insensitive:backdrop,
1238+.header-bar GtkSeparatorToolItem:backdrop,
1239+.header-bar .separator:backdrop,
1240+.header-bar .separator:insensitive:backdrop {
1241 border-color: shade (@dark_bg_color, 0.94);
1242 border-style: solid;
1243
1244
1245=== modified file 'Radiance/gtk-3.0/gtk-widgets-borders-radiance.css'
1246--- Radiance/gtk-3.0/gtk-widgets-borders-radiance.css 2012-08-08 13:46:38 +0000
1247+++ Radiance/gtk-3.0/gtk-widgets-borders-radiance.css 2013-07-28 23:09:26 +0000
1248@@ -1,32 +1,48 @@
1249-.primary-toolbar .button {
1250+.primary-toolbar .button,
1251+.menubar.toolbar .button,
1252+.header-bar .button {
1253 border-image: url("assets/radiance-button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1254 }
1255
1256-.primary-toolbar .button:focused {
1257+.primary-toolbar .button:focused,
1258+.menubar.toolbar .button:focused,
1259+.header-bar .button:focused {
1260 border-image: url("assets/radiance-button-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1261 }
1262
1263-.primary-toolbar .button:active {
1264+.primary-toolbar .button:active,
1265+.menubar.toolbar .button:active,
1266+.header-bar .button:active {
1267 border-image: url("assets/radiance-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1268 }
1269
1270-.primary-toolbar .button:active:focused {
1271+.primary-toolbar .button:active:focused,
1272+.menubar.toolbar .button:active:focused,
1273+.header-bar .button:active:focused {
1274 border-image: url("assets/radiance-button-toolbar-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1275 }
1276
1277-.primary-toolbar .button:backdrop {
1278+.primary-toolbar .button:backdrop,
1279+.menubar.toolbar .button:backdrop,
1280+.header-bar .button:backdrop {
1281 border-image: url("assets/radiance-backdrop-button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1282 }
1283
1284-.primary-toolbar .button:active:backdrop {
1285+.primary-toolbar .button:active:backdrop,
1286+.menubar.toolbar .button:active:backdrop,
1287+.header-bar .button:active:backdrop {
1288 border-image: url("assets/radiance-backdrop-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1289 }
1290
1291-.primary-toolbar .entry {
1292+.primary-toolbar .entry,
1293+.menubar.toolbar .entry,
1294+.header-bar .entry {
1295 border-image: url("assets/radiance-entry-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1296 }
1297
1298-.primary-toolbar .entry:focus {
1299+.primary-toolbar .entry:focus,
1300+.menubar.toolbar .entry:focus,
1301+.header-bar .entry:focus {
1302 border-image: url("assets/radiance-entry-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1303 }
1304
1305
1306=== modified file 'Radiance/gtk-3.0/gtk-widgets-borders.css'
1307--- Radiance/gtk-3.0/gtk-widgets-borders.css 2012-08-30 13:10:54 +0000
1308+++ Radiance/gtk-3.0/gtk-widgets-borders.css 2013-07-28 23:09:26 +0000
1309@@ -110,27 +110,39 @@
1310 border-image: url("assets/button-default-focused-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1311 }
1312
1313-.primary-toolbar .button {
1314+.primary-toolbar .button,
1315+.menubar.toolbar .button,
1316+.header-bar .button {
1317 border-image: url("assets/button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1318 }
1319
1320-.primary-toolbar .button:focused {
1321+.primary-toolbar .button:focused,
1322+.menubar.toolbar .button:focused,
1323+.header-bar .button:focused {
1324 border-image: url("assets/button-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1325 }
1326
1327-.primary-toolbar .button:active {
1328+.primary-toolbar .button:active,
1329+.menubar.toolbar .button:active,
1330+.header-bar .button:active {
1331 border-image: url("assets/button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1332 }
1333
1334-.primary-toolbar .button:active:focused {
1335+.primary-toolbar .button:active:focused,
1336+.menubar.toolbar .button:active:focused,
1337+.header-bar .button:active:focused {
1338 border-image: url("assets/button-toolbar-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1339 }
1340
1341-.primary-toolbar .button:backdrop {
1342+.primary-toolbar .button:backdrop,
1343+.menubar.toolbar .button:backdrop,
1344+.header-bar .button:backdrop {
1345 border-image: url("assets/backdrop-button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1346 }
1347
1348-.primary-toolbar .button:active:backdrop {
1349+.primary-toolbar .button:active:backdrop,
1350+.menubar.toolbar .button:active:backdrop,
1351+.header-bar .button:active:backdrop {
1352 border-image: url("assets/backdrop-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1353 }
1354
1355@@ -176,16 +188,24 @@
1356 border-image: url("assets/backdrop-entry-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1357 }
1358
1359-.primary-toolbar .entry {
1360+.primary-toolbar .entry,
1361+.menubar.toolbar .entry,
1362+.header-bar .entry {
1363 border-image: url("assets/entry-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1364 }
1365
1366-.primary-toolbar .entry:focus {
1367+.primary-toolbar .entry:focus,
1368+.menubar.toolbar .entry:focus,
1369+.header-bar .entry:focus {
1370 border-image: url("assets/entry-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1371 }
1372
1373 .primary-toolbar .entry.progressbar,
1374 .primary-toolbar .entry.progressbar,
1375+.menubar.toolbar .entry.progressbar,
1376+.menubar.toolbar .entry.progressbar,
1377+.header-bar .entry.progressbar,
1378+.header-bar .entry.progressbar,
1379 .entry.progressbar {
1380 border-radius: 8px;
1381 border-width: 0;
1382@@ -233,14 +253,22 @@
1383 }
1384
1385 .primary-toolbar GtkComboBox.combobox-entry .entry:first-child,
1386-.primary-toolbar GtkComboBox.combobox-entry .button:first-child {
1387+.primary-toolbar GtkComboBox.combobox-entry .button:first-child,
1388+.menubar.toolbar GtkComboBox.combobox-entry .entry:first-child,
1389+.menubar.toolbar GtkComboBox.combobox-entry .button:first-child,
1390+.header-bar GtkComboBox.combobox-entry .entry:first-child,
1391+.header-bar GtkComboBox.combobox-entry .button:first-child {
1392 border-image-width: 10px 0 10px 12px;
1393 border-radius: 8px 0 0 8px;
1394 border-right-width: 0;
1395 }
1396
1397 .primary-toolbar GtkComboBox.combobox-entry .entry:last-child,
1398-.primary-toolbar GtkComboBox.combobox-entry .button:last-child {
1399+.primary-toolbar GtkComboBox.combobox-entry .button:last-child,
1400+.menubar.toolbar GtkComboBox.combobox-entry .entry:last-child,
1401+.menubar.toolbar GtkComboBox.combobox-entry .button:last-child,
1402+.header-bar GtkComboBox.combobox-entry .entry:last-child,
1403+.header-bar GtkComboBox.combobox-entry .button:last-child {
1404 border-image-width: 10px 12px 10px 0;
1405 border-radius: 0 8px 8px 0;
1406 border-left-width: 0;
1407@@ -265,6 +293,22 @@
1408 .primary-toolbar .raised .button:active,
1409 .primary-toolbar .button.raised:insensitive,
1410 .primary-toolbar .raised .button:insensitive,
1411+.menubar.toolbar .entry,
1412+.menubar.toolbar GtkComboBox.combobox-entry .entry,
1413+.menubar.toolbar GtkComboBox.combobox-entry .button,
1414+.menubar.toolbar .button:active,
1415+.menubar.toolbar .button.raised:active,
1416+.menubar.toolbar .raised .button:active,
1417+.menubar.toolbar .button.raised:insensitive,
1418+.menubar.toolbar .raised .button:insensitive,
1419+.header-bar .entry,
1420+.header-bar GtkComboBox.combobox-entry .entry,
1421+.header-bar GtkComboBox.combobox-entry .button,
1422+.header-bar .button:active,
1423+.header-bar .button.raised:active,
1424+.header-bar .raised .button:active,
1425+.header-bar .button.raised:insensitive,
1426+.header-bar .raised .button:insensitive,
1427 .inline-toolbar.toolbar .button:active,
1428 .inline-toolbar.toolbar .button:insensitive,
1429 .inline-toolbar.toolbar GtkToolButton .button:active,
1430@@ -272,7 +316,15 @@
1431 .primary-toolbar GtkSwitch.trough,
1432 .primary-toolbar GtkSwitch.trough:insensitive,
1433 .primary-toolbar GtkComboBox .button:active,
1434-.primary-toolbar GtkComboBox .button:insensitive {
1435+.primary-toolbar GtkComboBox .button:insensitive,
1436+.menubar.toolbar GtkSwitch.trough,
1437+.header-bar GtkSwitch.trough,
1438+.menubar.toolbar GtkSwitch.trough:insensitive,
1439+.header-bar GtkSwitch.trough:insensitive,
1440+.menubar.toolbar GtkComboBox .button:active,
1441+.header-bar GtkComboBox .button:active,
1442+.menubar.toolbar GtkComboBox .button:insensitive,
1443+.header-bar GtkComboBox .button:insensitive {
1444 }
1445
1446 /* primary toolbar - focused element borders */
1447@@ -284,16 +336,40 @@
1448 .primary-toolbar .raised .button:focus:active,
1449 .primary-toolbar .button.raised.default:active,
1450 .primary-toolbar .raised .button.default:active,
1451+.menubar.toolbar .entry:focus,
1452+.menubar.toolbar .button:active:focus,
1453+.menubar.toolbar GtkComboBox.combobox-entry .entry:focus,
1454+.menubar.toolbar GtkComboBox.combobox-entry .button:focus,
1455+.menubar.toolbar .button.raised:focus:active,
1456+.menubar.toolbar .raised .button:focus:active,
1457+.menubar.toolbar .button.raised.default:active,
1458+.menubar.toolbar .raised .button.default:active,
1459+.header-bar .entry:focus,
1460+.header-bar .button:active:focus,
1461+.header-bar GtkComboBox.combobox-entry .entry:focus,
1462+.header-bar GtkComboBox.combobox-entry .button:focus,
1463+.header-bar .button.raised:focus:active,
1464+.header-bar .raised .button:focus:active,
1465+.header-bar .button.raised.default:active,
1466+.header-bar .raised .button.default:active,
1467 .inline-toolbar.toolbar .button:focus:active,
1468 .inline-toolbar.toolbar .button.default:active,
1469-.primary-toolbar GtkComboBox .button:active:focus {
1470+.primary-toolbar GtkComboBox .button:active:focus,
1471+.menubar.toolbar GtkComboBox .button:active:focus,
1472+.header-bar GtkComboBox .button:active:focus {
1473 }
1474
1475 /* primary toolbar - generic button borders */
1476 .primary-toolbar .button.raised,
1477 .primary-toolbar .raised .button,
1478+.menubar.toolbar .button.raised,
1479+.menubar.toolbar .raised .button,
1480+.header-bar .button.raised,
1481+.header-bar .raised .button,
1482 .inline-toolbar.toolbar .button,
1483-.primary-toolbar GtkComboBox .button {
1484+.primary-toolbar GtkComboBox .button,
1485+.menubar.toolbar GtkComboBox .button,
1486+.header-bar GtkComboBox .button {
1487 }
1488
1489 /* primary toolbar - focused button borders */
1490@@ -301,9 +377,19 @@
1491 .primary-toolbar .button.raised.default,
1492 .primary-toolbar .raised .button:focus,
1493 .primary-toolbar .raised .button.default,
1494+.menubar.toolbar .button.raised:focus,
1495+.menubar.toolbar .button.raised.default,
1496+.menubar.toolbar .raised .button:focus,
1497+.menubar.toolbar .raised .button.default,
1498+.header-bar .button.raised:focus,
1499+.header-bar .button.raised.default,
1500+.header-bar .raised .button:focus,
1501+.header-bar .raised .button.default,
1502 .inline-toolbar.toolbar .button:focus,
1503 .inline-toolbar.toolbar .button.default,
1504-.primary-toolbar GtkComboBox .button:focus {
1505+.primary-toolbar GtkComboBox .button:focus,
1506+.menubar.toolbar GtkComboBox .button:focus,
1507+.header-bar GtkComboBox .button:focus {
1508 }
1509
1510 /* column-headers borders */
1511@@ -398,11 +484,15 @@
1512 border-image: url("assets/switch-trough-on.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1513 }
1514
1515-.primary-toolbar GtkSwitch.trough {
1516+.primary-toolbar GtkSwitch.trough,
1517+.menubar.toolbar GtkSwitch.trough,
1518+.header-bar GtkSwitch.trough {
1519 border-image: url("assets/switch-trough-toolbar-off.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1520 }
1521
1522-.primary-toolbar GtkSwitch.trough:active {
1523+.primary-toolbar GtkSwitch.trough:active,
1524+.menubar.toolbar GtkSwitch.trough:active,
1525+.header-bar GtkSwitch.trough:active {
1526 border-image: url("assets/switch-trough-toolbar-on.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1527 }
1528
1529
1530=== modified file 'Radiance/gtk-3.0/gtk-widgets-radiance.css'
1531--- Radiance/gtk-3.0/gtk-widgets-radiance.css 2012-08-08 13:46:38 +0000
1532+++ Radiance/gtk-3.0/gtk-widgets-radiance.css 2013-07-28 23:09:26 +0000
1533@@ -1,38 +1,74 @@
1534 /* Set up shadows and hilights for button visual separation */
1535 .primary-toolbar .linked .button,
1536 .primary-toolbar .button.raised.linked,
1537-.primary-toolbar .raised.linked .button {
1538+.primary-toolbar .raised.linked .button,
1539+.menubar.toolbar .linked .button,
1540+.menubar.toolbar .button.raised.linked,
1541+.menubar.toolbar .raised.linked .button,
1542+.header-bar .linked .button,
1543+.header-bar .button.raised.linked,
1544+.header-bar .button.raised.linked .button {
1545 box-shadow: inset 1px 0 shade (@dark_bg_color, 1.1),
1546 inset -1px 0 shade (@dark_bg_color, 0.9);
1547 }
1548
1549 .primary-toolbar .linked .button:first-child,
1550 .primary-toolbar .button.raised.linked:first-child,
1551-.primary-toolbar .raised.linked .button:first-child {
1552+.primary-toolbar .raised.linked .button:first-child,
1553+.menubar.toolbar .linked .button:first-child,
1554+.menubar.toolbar .button.raised.linked:first-child,
1555+.menubar.toolbar .raised.linked .button:first-child,
1556+.header-bar .linked .button:first-child,
1557+.header-bar .button.raised.linked:first-child,
1558+.header-bar .raised.linked .button:first-child {
1559 box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9);
1560 }
1561
1562 .primary-toolbar .linked .button:last-child,
1563 .primary-toolbar .button.raised.linked:last-child,
1564-.primary-toolbar .raised.linked .button:last-child {
1565+.primary-toolbar .raised.linked .button:last-child,
1566+.menubar.toolbar .linked .button:last-child,
1567+.menubar.toolbar .button.raised.linked:last-child,
1568+.menubar.toolbar .raised.linked .button:last-child,
1569+.header-bar .linked .button:last-child,
1570+.header-bar .button.raised.linked:last-child,
1571+.header-bar .raised.linked .button:last-child {
1572 box-shadow: inset 1px 0 shade (@dark_bg_color, 1.1)
1573 }
1574
1575 .primary-toolbar .linked .button:active,
1576 .primary-toolbar .button.raised.linked:active,
1577-.primary-toolbar .raised.linked .button:active {
1578+.primary-toolbar .raised.linked .button:active,
1579+.menubar.toolbar .linked .button:active,
1580+.menubar.toolbar .button.raised.linked:active,
1581+.menubar.toolbar .raised.linked .button:active,
1582+.header-bar .linked .button:active,
1583+.header-bar .button.raised.linked:active,
1584+.header-bar .raised.linked .button:active {
1585 box-shadow: inset 1px 0 shade (@dark_bg_color, 0.9);
1586 }
1587
1588 .primary-toolbar .linked .button:insensitive,
1589 .primary-toolbar .button.raised.linked:insensitive,
1590-.primary-toolbar .raised.linked .button:insensitive {
1591+.primary-toolbar .raised.linked .button:insensitive,
1592+.menubar.toolbar .linked .button:insensitive,
1593+.menubar.toolbar .button.raised.linked:insensitive,
1594+.menubar.toolbar .raised.linked .button:insensitive,
1595+.header-bar .linked .button:insensitive,
1596+.header-bar .button.raised.linked:insensitive,
1597+.header-bar .raised.linked .button:insensitive {
1598 box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9);
1599 }
1600
1601 .primary-toolbar .linked .button:backdrop:last-child,
1602 .primary-toolbar .button.raised.linked:backdrop:last-child,
1603-.primary-toolbar .raised.linked .button:backdrop:last-child {
1604+.primary-toolbar .raised.linked .button:backdrop:last-child,
1605+.menubar.toolbar .linked .button:backdrop:last-child,
1606+.menubar.toolbar .button.raised.linked:backdrop:last-child,
1607+.menubar.toolbar .raised.linked .button:backdrop:last-child,
1608+.header-bar .linked .button:backdrop:last-child,
1609+.header-bar .button.raised.linked:backdrop:last-child,
1610+.header-bar .raised.linked .button:backdrop:last-child {
1611 box-shadow: inset 1px 0 shade (@dark_bg_color, 1.1);
1612 }
1613
1614@@ -62,7 +98,9 @@
1615 /* primary-toolbar */
1616 .primary-toolbar,
1617 .primary-toolbar .toolbar,
1618-.primary-toolbar.toolbar {
1619+.primary-toolbar.toolbar,
1620+.menubar.toolbar,
1621+.header-bar {
1622 background-image: -gtk-gradient (linear, left top, left bottom,
1623 from (shade (@dark_bg_color, 0.96)),
1624 to (shade (@dark_bg_color, 1.1)));
1625@@ -72,13 +110,21 @@
1626 text-shadow: 0 1px shade (@dark_bg_color, 1.1);
1627 }
1628
1629-.primary-toolbar :insensitive {
1630+.primary-toolbar :insensitive,
1631+.menubar.toolbar :insensitive,
1632+.header-bar :insensitive {
1633 text-shadow: 0 1px shade (@dark_bg_color, 1.1);
1634 }
1635
1636 .primary-toolbar GtkComboBox,
1637 .primary-toolbar .button *,
1638-.primary-toolbar .button {
1639+.primary-toolbar .button,
1640+.menubar.toolbar GtkComboBox,
1641+.menubar.toolbar .button *,
1642+.menubar.toolbar .button,
1643+.header-bar GtkComboBox,
1644+.header-bar .button *,
1645+.header-bar .button {
1646 text-shadow: 0 1px alpha (shade (@dark_bg_color, 1.25), 0.32);
1647 }
1648
1649@@ -86,7 +132,17 @@
1650 .primary-toolbar .raised.button,
1651 .primary-toolbar .button:hover,
1652 .primary-toolbar .button:active,
1653-.primary-toolbar .button:insensitive {
1654+.primary-toolbar .button:insensitive,
1655+.menubar.toolbar .raised .button,
1656+.menubar.toolbar .raised.button,
1657+.menubar.toolbar .button:hover,
1658+.menubar.toolbar .button:active,
1659+.menubar.toolbar .button:insensitive,
1660+.header-bar .raised .button,
1661+.header-bar .raised.button,
1662+.header-bar .button:hover,
1663+.header-bar .button:active,
1664+.header-bar .button:insensitive {
1665 background-image: -gtk-gradient (linear, left top, left bottom,
1666 from (shade (@dark_bg_color, 1.03)),
1667 to (shade (@dark_bg_color, 0.96)));
1668
1669=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
1670--- Radiance/gtk-3.0/gtk-widgets.css 2013-03-01 23:35:05 +0000
1671+++ Radiance/gtk-3.0/gtk-widgets.css 2013-07-28 23:09:26 +0000
1672@@ -272,7 +272,17 @@
1673 .primary-toolbar .linked .button,
1674 .primary-toolbar .linked .button:active,
1675 .primary-toolbar .linked .button:active:hover,
1676-.primary-toolbar .linked .button:insensitive {
1677+.primary-toolbar .linked .button:insensitive,
1678+.menubar.toolbar .linked .entry,
1679+.menubar.toolbar .linked .button,
1680+.menubar.toolbar .linked .button:active,
1681+.menubar.toolbar .linked .button:active:hover,
1682+.menubar.toolbar .linked .button:insensitive,
1683+.header-bar .linked .entry,
1684+.header-bar .linked .button,
1685+.header-bar .linked .button:active,
1686+.header-bar .linked .button:active:hover,
1687+.header-bar .linked .button:insensitive {
1688 border-width: 1px;
1689 border-right-width: 0;
1690
1691@@ -400,44 +410,86 @@
1692 /* Set up shadows and hilights for button visual separation */
1693 .primary-toolbar .linked .button,
1694 .primary-toolbar .button.raised.linked,
1695-.primary-toolbar .raised.linked .button {
1696+.primary-toolbar .raised.linked .button,
1697+.menubar.toolbar .linked .button,
1698+.menubar.toolbar .button.raised.linked,
1699+.menubar.toolbar .raised.linked .button,
1700+.header-bar .linked .button,
1701+.header-bar .button.raised.linked,
1702+.header-bar .raised.linked .button {
1703 box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4),
1704 inset -1px 0 shade (@dark_bg_color, 0.9);
1705 }
1706
1707 .primary-toolbar .linked .button:first-child,
1708 .primary-toolbar .button.raised.linked:first-child,
1709-.primary-toolbar .raised.linked .button:first-child {
1710+.primary-toolbar .raised.linked .button:first-child,
1711+.menubar.toolbar .linked .button:first-child,
1712+.menubar.toolbar .button.raised.linked:first-child,
1713+.menubar.toolbar .raised.linked .button:first-child,
1714+.header-bar .linked .button:first-child,
1715+.header-bar .button.raised.linked:first-child,
1716+.header-bar .raised.linked .button:first-child {
1717 box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9);
1718 }
1719
1720 .primary-toolbar .linked .button:last-child,
1721 .primary-toolbar .button.raised.linked:last-child,
1722-.primary-toolbar .raised.linked .button:last-child {
1723+.primary-toolbar .raised.linked .button:last-child,
1724+.menubar.toolbar .linked .button:last-child,
1725+.menubar.toolbar .button.raised.linked:last-child,
1726+.menubar.toolbar .raised.linked .button:last-child,
1727+.header-bar .linked .button:last-child,
1728+.header-bar .button.raised.linked:last-child,
1729+.header-bar .raised.linked .button:last-child {
1730 box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4)
1731 }
1732
1733 .primary-toolbar .linked .button:active,
1734 .primary-toolbar .button.raised.linked:active,
1735-.primary-toolbar .raised.linked .button:active {
1736+.primary-toolbar .raised.linked .button:active,
1737+.menubar.toolbar .linked .button:active,
1738+.menubar.toolbar .button.raised.linked:active,
1739+.menubar.toolbar .raised.linked .button:active,
1740+.header-bar .linked .button:active,
1741+.header-bar .button.raised.linked:active,
1742+.header-bar .raised.linked .button:active {
1743 box-shadow: inset 1px 0 shade (@dark_bg_color, 0.9);
1744 }
1745
1746 .primary-toolbar .linked .button:insensitive,
1747 .primary-toolbar .button.raised.linked:insensitive,
1748-.primary-toolbar .raised.linked .button:insensitive {
1749+.primary-toolbar .raised.linked .button:insensitive,
1750+.menubar.toolbar .linked .button:insensitive,
1751+.menubar.toolbar .button.raised.linked:insensitive,
1752+.menubar.toolbar .raised.linked .button:insensitive,
1753+.header-bar .linked .button:insensitive,
1754+.header-bar .button.raised.linked:insensitive,
1755+.header-bar .raised.linked .button:insensitive {
1756 box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9);
1757 }
1758
1759 .primary-toolbar .linked .button:backdrop:last-child,
1760 .primary-toolbar .button.raised.linked:backdrop:last-child,
1761-.primary-toolbar .raised.linked .button:backdrop:last-child {
1762+.primary-toolbar .raised.linked .button:backdrop:last-child,
1763+.menubar.toolbar .linked .button:backdrop:last-child,
1764+.menubar.toolbar .button.raised.linked:backdrop:last-child,
1765+.menubar.toolbar .raised.linked .button:backdrop:last-child,
1766+.header-bar .linked .button:backdrop:last-child,
1767+.header-bar .button.raised.linked:backdrop:last-child,
1768+.header-bar .raised.linked .button:backdrop:last-child {
1769 box-shadow: inset 1px 0 shade (@dark_bg_color, 1.2);
1770 }
1771
1772 /*.primary-toolbar .linked .button:insensitive:backdrop,
1773 .primary-toolbar .button.raised.linked:insensitive:backdrop,
1774-.primary-toolbar .raised.linked .button:insensitive:backdrop {
1775+.primary-toolbar .raised.linked .button:insensitive:backdrop,
1776+.menubar.toolbar .linked .button:insensitive:backdrop,
1777+.menubar.toolbar .button.raised.linked:insensitive:backdrop,
1778+.menubar.toolbar .raised.linked .button:insensitive:backdrop,
1779+.header-bar .linked .button:insensitive:backdrop,
1780+.header-bar .button.raised.linked:insensitive:backdrop,
1781+.header-bar .raised.linked .button:insensitive:backdrop {
1782 box-shadow: inset -1px 0 @unfocused_insensitive_borders;
1783 }*/
1784
1785@@ -447,7 +499,17 @@
1786 .primary-toolbar .linked .button:only-child,
1787 .primary-toolbar .linked .button:active:only-child,
1788 .primary-toolbar .linked .button:active:hover:only-child,
1789-.primary-toolbar .linked .button:insensitive:only-child {
1790+.primary-toolbar .linked .button:insensitive:only-child,
1791+.menubar.toolbar .linked .entry:only-child,
1792+.menubar.toolbar .linked .button:only-child,
1793+.menubar.toolbar .linked .button:active:only-child,
1794+.menubar.toolbar .linked .button:active:hover:only-child,
1795+.menubar.toolbar .linked .button:insensitive:only-child,
1796+.header-bar .linked .entry:only-child,
1797+.header-bar .linked .button:only-child,
1798+.header-bar .linked .button:active:only-child,
1799+.header-bar .linked .button:active:hover:only-child,
1800+.header-bar .linked .button:insensitive:only-child {
1801 border-radius: 8px;
1802 box-shadow: none;
1803 }
1804@@ -692,6 +754,10 @@
1805
1806 .primary-toolbar .entry.progressbar,
1807 .primary-toolbar .entry.progressbar,
1808+.menubar.toolbar .entry.progressbar,
1809+.menubar.toolbar .entry.progressbar,
1810+.header-bar .entry.progressbar,
1811+.header-bar .entry.progressbar,
1812 .entry.progressbar {
1813 background-image: -gtk-gradient (linear, left top, left bottom,
1814 from (shade (@selected_bg_color, 0.8)),
1815@@ -850,8 +916,12 @@
1816 ********/
1817 GtkTreeMenu.menu,
1818 .toolbar .primary-toolbar .menu,
1819+.toolbar .menubar.toolbar .menu,
1820+.toolbar .header-bar .menu,
1821 GtkMenuToolButton.menu,
1822 .primary-toolbar .button .menu,
1823+.menubar.toolbar .button .menu,
1824+.header-bar .button .menu,
1825 .menu {
1826 background-image: none;
1827 background-color: shade (@dark_bg_color, 1.08);
1828@@ -902,7 +972,17 @@
1829 .primary-toolbar .menu.button:active,
1830 .primary-toolbar .menu.button:active:insensitive,
1831 .primary-toolbar .menu.button:insensitive,
1832-.primary-toolbar .menu.button */
1833+.primary-toolbar .menu.button,
1834+.menubar.toolbar .menu.button:hover,
1835+.menubar.toolbar .menu.button:active,
1836+.menubar.toolbar .menu.button:active:insensitive,
1837+.menubar.toolbar .menu.button:insensitive,
1838+.menubar.toolbar .menu.button,
1839+.header-bar .menu.button:hover,
1840+.header-bar .menu.button:active,
1841+.header-bar .menu.button:active:insensitive,
1842+.header-bar .menu.button:insensitive,
1843+.header-bar .menu.button */
1844 {
1845 background-color: shade (@dark_bg_color, 1.08);
1846 background-image: none;
1847@@ -1015,10 +1095,18 @@
1848 GtkTreeMenu.menu .menuitem *:insensitive,
1849 .toolbar .primary-toolbar .menu .menuitem:insensitive,
1850 .toolbar .primary-toolbar .menu .menuitem *:insensitive,
1851+.toolbar .menubar.toolbar .menu .menuitem:insensitive,
1852+.toolbar .menubar.toolbar .menu .menuitem *:insensitive,
1853+.toolbar .header-bar .menu .menuitem:insensitive,
1854+.toolbar .header-bar .menu .menuitem *:insensitive,
1855 GtkMenuToolButton.menu .menuitem:insensitive,
1856 GtkMenuToolButton.menu .menuitem *:insensitive,
1857 .primary-toolbar .button .menu .menuitem:insensitive,
1858 .primary-toolbar .button .menu .menuitem *:insensitive,
1859+.menubar.toolbar .button .menu .menuitem:insensitive,
1860+.menubar.toolbar .button .menu .menuitem *:insensitive,
1861+.header-bar .button .menu .menuitem:insensitive,
1862+.header-bar .button .menu .menuitem *:insensitive,
1863 .menuitem:insensitive,
1864 .menuitem *:insensitive {
1865 color: mix (@dark_fg_color, @dark_bg_color, 0.5);
1866@@ -1070,6 +1158,10 @@
1867
1868 .primary-toolbar GtkScale.trough,
1869 .primary-toolbar GtkScale.trough:backdrop,
1870+.menubar.toolbar GtkScale.trough,
1871+.menubar.toolbar GtkScale.trough:backdrop,
1872+.header-bar GtkScale.trough,
1873+.header-bar GtkScale.trough:backdrop,
1874 .menuitem GtkScale.trough {
1875 background-color: @dark_bg_color;
1876 background-image: none;
1877@@ -1572,8 +1664,12 @@
1878
1879 GtkTreeMenu .menuitem.separator,
1880 .toolbar .primary-toolbar .menuitem.separator,
1881+.toolbar .menubar.toolbar .menuitem.separator,
1882+.toolbar .header-bar .menuitem.separator,
1883 GtkMenuToolButton .menuitem.separator,
1884 .primary-toolbar .button .menuitem.separator,
1885+.menubar.toolbar .button .menuitem.separator,
1886+.header-bar .button .menuitem.separator,
1887 .menuitem.separator {
1888 border-color: shade (@dark_bg_color, 0.99);
1889 border-bottom-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
1890@@ -1754,7 +1850,11 @@
1891
1892 .menu.spinner,
1893 .primary-toolbar .spinner,
1894-.primary-toolbar .spinner {
1895+.primary-toolbar .spinner,
1896+.menubar.toolbar .spinner,
1897+.menubar.toolbar .spinner,
1898+.header-bar .spinner,
1899+.header-bar .spinner {
1900 color: @selected_bg_color;
1901 }
1902
1903@@ -1846,7 +1946,9 @@
1904 /* primary-toolbar */
1905 .primary-toolbar,
1906 .primary-toolbar .toolbar,
1907-.primary-toolbar.toolbar {
1908+.primary-toolbar.toolbar,
1909+.menubar.toolbar,
1910+.header-bar {
1911 -GtkWidget-window-dragging: true;
1912
1913 background-image: -gtk-gradient (linear, left top, left bottom,
1914@@ -1864,7 +1966,10 @@
1915 }
1916
1917 .primary-toolbar .toolbar:backdrop,
1918-.primary-toolbar.toolbar:backdrop {
1919+.primary-toolbar.toolbar:backdrop,
1920+.menubar.toolbar .toolbar:backdrop,
1921+.menubar.toolbar.toolbar:backdrop,
1922+.header-bar:backdrop {
1923 background-image: none;
1924 background-color: @dark_bg_color;
1925 box-shadow: none;
1926@@ -1874,12 +1979,18 @@
1927 color: @backdrop_dark_fg_color;
1928 }
1929
1930-.primary-toolbar :insensitive {
1931+.primary-toolbar :insensitive,
1932+.menubar.toolbar .toolbar :insensitive,
1933+.header-bar :insensitive {
1934 text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
1935 }
1936
1937 .primary-toolbar GtkComboBox,
1938-.primary-toolbar .button {
1939+.primary-toolbar .button,
1940+.menubar.toolbar GtkComboBox,
1941+.menubar.toolbar .button,
1942+.header-bar GtkComboBox,
1943+.header-bar .button {
1944 background-color: transparent;
1945 background-image: none;
1946 border-color: transparent;
1947@@ -1892,7 +2003,11 @@
1948 }
1949
1950 .primary-toolbar GtkComboBox:backdrop,
1951-.primary-toolbar .button:backdrop {
1952+.primary-toolbar .button:backdrop,
1953+.menubar.toolbar GtkComboBox:backdrop,
1954+.menubar.toolbar .button:backdrop,
1955+.header-bar GtkComboBox:backdrop,
1956+.header-bar .button:backdrop {
1957 color: @backdrop_dark_fg_color;
1958 text-shadow: 0 -1px shade (@dark_bg_color, 0.9);
1959 }
1960@@ -1901,7 +2016,17 @@
1961 .primary-toolbar .raised.button,
1962 .primary-toolbar .button:hover,
1963 .primary-toolbar .button:active,
1964-.primary-toolbar .button:insensitive {
1965+.primary-toolbar .button:insensitive,
1966+.menubar.toolbar .raised .button,
1967+.menubar.toolbar .raised.button,
1968+.menubar.toolbar .button:hover,
1969+.menubar.toolbar .button:active,
1970+.menubar.toolbar .button:insensitive,
1971+.header-bar .raised .button,
1972+.header-bar .raised.button,
1973+.header-bar .button:hover,
1974+.header-bar .button:active,
1975+.header-bar .button:insensitive {
1976 background-image: -gtk-gradient (linear, left top, left bottom,
1977 from (shade (@dark_bg_color, 1.2)),
1978 to (shade (@dark_bg_color, 1.1)));
1979@@ -1912,19 +2037,41 @@
1980 .primary-toolbar .raised.button:focus,
1981 .primary-toolbar .button:hover:focus,
1982 .primary-toolbar .button:active:focus,
1983-.primary-toolbar .button:insensitive:focus {
1984+.primary-toolbar .button:insensitive:focus,
1985+.menubar.toolbar .raised .button:focus,
1986+.menubar.toolbar .raised.button:focus,
1987+.menubar.toolbar .button:hover:focus,
1988+.menubar.toolbar .button:active:focus,
1989+.menubar.toolbar .button:insensitive:focus,
1990+.header-bar .raised .button:focus,
1991+.header-bar .raised.button:focus,
1992+.header-bar .button:hover:focus,
1993+.header-bar .button:active:focus,
1994+.header-bar .button:insensitive:focus {
1995 }
1996
1997-.primary-toolbar GtkComboBox.combobox-entry .button {
1998+.primary-toolbar GtkComboBox.combobox-entry .button,
1999+.menubar.toolbar GtkComboBox.combobox-entry .button,
2000+.header-bar GtkComboBox.combobox-entry .button {
2001 }
2002
2003 .primary-toolbar GtkComboBox.combobox-entry .button,
2004 .primary-toolbar .raised .button,
2005 .primary-toolbar .raised.button,
2006-.primary-toolbar .button:hover {
2007+.primary-toolbar .button:hover,
2008+.menubar.toolbar GtkComboBox.combobox-entry .button,
2009+.menubar.toolbar .raised .button,
2010+.menubar.toolbar .raised.button,
2011+.menubar.toolbar .button:hover,
2012+.header-bar GtkComboBox.combobox-entry .button,
2013+.header-bar .raised .button,
2014+.header-bar .raised.button,
2015+.header-bar .button:hover {
2016 }
2017
2018-.primary-toolbar .button:active {
2019+.primary-toolbar .button:active,
2020+.menubar.toolbar .button:active,
2021+.header-bar .button:active {
2022 background-image: -gtk-gradient (linear, left top, left bottom,
2023 from (shade (@dark_bg_color, 0.9)),
2024 to (shade (@dark_bg_color, 0.95)));
2025@@ -1932,24 +2079,34 @@
2026 text-shadow: 0 -1px shade (@dark_bg_color, 0.6);
2027 }
2028
2029-.primary-toolbar .button:active:hover {
2030+.primary-toolbar .button:active:hover,
2031+.menubar.toolbar .button:active:hover,
2032+.header-bar .button:active:hover {
2033 background-image: -gtk-gradient (linear, left top, left bottom,
2034 from (shade (@dark_bg_color, 0.95)),
2035 to (shade (@dark_bg_color, 1.0)));
2036 }
2037
2038 .primary-toolbar .button:active:insensitive,
2039-.primary-toolbar .button:insensitive {
2040+.primary-toolbar .button:insensitive,
2041+.menubar.toolbar .button:active:insensitive,
2042+.menubar.toolbar .button:insensitive,
2043+.header-bar .button:active:insensitive,
2044+.header-bar .button:insensitive {
2045 text-shadow: none;
2046 }
2047
2048-.primary-toolbar .button:insensitive {
2049+.primary-toolbar .button:insensitive,
2050+.menubar.toolbar .button:insensitive,
2051+.header-bar .button:insensitive {
2052 background-image: -gtk-gradient (linear, left top, left bottom,
2053 from (shade (@dark_bg_color, 1.01)),
2054 to (shade (@dark_bg_color, 0.99)));
2055 }
2056
2057-.primary-toolbar .button:active:insensitive {
2058+.primary-toolbar .button:active:insensitive,
2059+.menubar.toolbar .button:active:insensitive,
2060+.header-bar .button:active:insensitive {
2061 background-image: -gtk-gradient (linear, left top, left bottom,
2062 from (shade (@dark_bg_color, 0.94)),
2063 to (shade (@dark_bg_color, 1.02)));
2064@@ -1957,7 +2114,13 @@
2065
2066 .primary-toolbar .entry,
2067 .primary-toolbar .entry:active,
2068-.primary-toolbar .entry:focused {
2069+.primary-toolbar .entry:focused,
2070+.menubar.toolbar .entry,
2071+.menubar.toolbar .entry:active,
2072+.menubar.toolbar .entry:focused,
2073+.header-bar .entry,
2074+.header-bar .entry:active,
2075+.header-bar .entry:focused {
2076 border-radius: 9px;
2077
2078 /* background-color: @dark_bg_color;
2079@@ -1968,7 +2131,13 @@
2080
2081 .primary-toolbar GtkSeparatorToolItem,
2082 .primary-toolbar .separator,
2083-.primary-toolbar .separator:insensitive {
2084+.primary-toolbar .separator:insensitive,
2085+.menubar.toolbar GtkSeparatorToolItem,
2086+.menubar.toolbar .separator,
2087+.menubar.toolbar .separator:insensitive,
2088+.header-bar GtkSeparatorToolItem,
2089+.header-bar .separator,
2090+.header-bar .separator:insensitive {
2091 border-color: alpha (shade (@dark_bg_color, 0.94), 0.35);
2092 border-bottom-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
2093 border-right-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
2094@@ -2017,6 +2186,42 @@
2095 .primary-toolbar .raised.linked .button:focus:active,
2096 .primary-toolbar .raised.linked .button:insensitive,
2097 .primary-toolbar .raised.linked .button:backdrop,
2098+.menubar.toolbar .linked .button,
2099+.menubar.toolbar .linked .button:active,
2100+.menubar.toolbar .linked .button:focus,
2101+.menubar.toolbar .linked .button:focus:active,
2102+.menubar.toolbar .linked .button:hover,
2103+.menubar.toolbar .linked .button:hover:active,
2104+.menubar.toolbar .linked .button:insensitive,
2105+.menubar.toolbar .linked .button:backdrop,
2106+.menubar.toolbar .linked .entry,
2107+.menubar.toolbar .linked .entry:active,
2108+.menubar.toolbar .linked .entry:focused,
2109+.menubar.toolbar .linked .entry:focused:active,
2110+.menubar.toolbar .linked .entry:insensitive,
2111+.menubar.toolbar .raised.linked .button,
2112+.menubar.toolbar .raised.linked .button:active,
2113+.menubar.toolbar .raised.linked .button:focus,
2114+.menubar.toolbar .raised.linked .button:focus:active,
2115+.menubar.toolbar .raised.linked .button:insensitive,
2116+.menubar.toolbar .raised.linked .button:backdrop,
2117+.header-bar .linked .button,
2118+.header-bar .linked .button:active,
2119+.header-bar .linked .button:focus,
2120+.header-bar .linked .button:focus:active,
2121+.header-bar .linked .button:insensitive,
2122+.header-bar .linked .button:backdrop,
2123+.header-bar .linked .entry,
2124+.header-bar .linked .entry:active,
2125+.header-bar .linked .entry:focused,
2126+.header-bar .linked .entry:focused:active,
2127+.header-bar .linked .entry:insensitive,
2128+.header-bar .raised.linked .button,
2129+.header-bar .raised.linked .button:active,
2130+.header-bar .raised.linked .button:focus,
2131+.header-bar .raised.linked .button:focus:active,
2132+.header-bar .raised.linked .button:insensitive,
2133+.header-bar .raised.linked .button:backdrop,
2134 .inline-toolbar.toolbar .button,
2135 .inline-toolbar.toolbar .button:active,
2136 .inline-toolbar.toolbar .button:focus,
2137@@ -2050,6 +2255,40 @@
2138 .primary-toolbar .raised.linked .button:focus:active:first-child,
2139 .primary-toolbar .raised.linked .button:insensitive:first-child,
2140 .primary-toolbar .raised.linked .button:backdrop:first-child,
2141+.menubar.toolbar .linked .button:first-child,
2142+.menubar.toolbar .linked .button:active:first-child,
2143+.menubar.toolbar .linked .button:focus:first-child,
2144+.menubar.toolbar .linked .button:focus:active:first-child,
2145+.menubar.toolbar .linked .button:insensitive:first-child,
2146+.menubar.toolbar .linked .button:backdrop:first-child,
2147+.menubar.toolbar .linked .entry:first-child,
2148+.menubar.toolbar .linked .entry:active:first-child,
2149+.menubar.toolbar .linked .entry:focused:first-child,
2150+.menubar.toolbar .linked .entry:focused:active:first-child,
2151+.menubar.toolbar .linked .entry:insensitive:first-child,
2152+.menubar.toolbar .raised.linked .button:first-child,
2153+.menubar.toolbar .raised.linked .button:active:first-child,
2154+.menubar.toolbar .raised.linked .button:focus:first-child,
2155+.menubar.toolbar .raised.linked .button:focus:active:first-child,
2156+.menubar.toolbar .raised.linked .button:insensitive:first-child,
2157+.menubar.toolbar .raised.linked .button:backdrop:first-child,
2158+.header-bar .linked .linked .button:first-child,
2159+.header-bar .linked .button:active:first-child,
2160+.header-bar .linked .button:focus:first-child,
2161+.header-bar .linked .button:focus:active:first-child,
2162+.header-bar .linked .button:insensitive:first-child,
2163+.header-bar .linked .button:backdrop:first-child,
2164+.header-bar .linked .entry:first-child,
2165+.header-bar .linked .entry:active:first-child,
2166+.header-bar .linked .entry:focused:first-child,
2167+.header-bar .linked .entry:focused:active:first-child,
2168+.header-bar .linked .entry:insensitive:first-child,
2169+.header-bar .raised.linked .button:first-child,
2170+.header-bar .raised.linked .button:active:first-child,
2171+.header-bar .raised.linked .button:focus:first-child,
2172+.header-bar .raised.linked .button:focus:active:first-child,
2173+.header-bar .raised.linked .button:insensitive:first-child,
2174+.header-bar .raised.linked .button:backdrop:first-child,
2175 .inline-toolbar.toolbar .button:first-child,
2176 .inline-toolbar.toolbar .button:active:first-child,
2177 .inline-toolbar.toolbar .button:focus:first-child,
2178@@ -2085,6 +2324,40 @@
2179 .primary-toolbar .raised.linked .button:focus:active:last-child,
2180 .primary-toolbar .raised.linked .button:insensitive:last-child,
2181 .primary-toolbar .raised.linked .button:backdrop:last-child,
2182+.menubar.toolbar .linked .button:last-child,
2183+.menubar.toolbar .linked .button:active:last-child,
2184+.menubar.toolbar .linked .button:focus:last-child,
2185+.menubar.toolbar .linked .button:focus:active:last-child,
2186+.menubar.toolbar .linked .button:insensitive:last-child,
2187+.menubar.toolbar .linked .button:backdrop:last-child,
2188+.menubar.toolbar .linked .entry:last-child,
2189+.menubar.toolbar .linked .entry.active:last-child,
2190+.menubar.toolbar .linked .entry:focused:last-child,
2191+.menubar.toolbar .linked .entry:focused:active:last-child,
2192+.menubar.toolbar .linked .entry:insensitive:last-child,
2193+.menubar.toolbar .raised.linked .button:last-child,
2194+.menubar.toolbar .raised.linked .button:active:last-child,
2195+.menubar.toolbar .raised.linked .button:focus:last-child,
2196+.menubar.toolbar .raised.linked .button:focus:active:last-child,
2197+.menubar.toolbar .raised.linked .button:insensitive:last-child,
2198+.menubar.toolbar .raised.linked .button:backdrop:last-child,
2199+.header-bar .linked .button:last-child,
2200+.header-bar .linked .button:active:last-child,
2201+.header-bar .linked .button:focus:last-child,
2202+.header-bar .linked .button:focus:active:last-child,
2203+.header-bar .linked .button:insensitive:last-child,
2204+.header-bar .linked .button:backdrop:last-child,
2205+.header-bar .linked .entry:last-child,
2206+.header-bar .linked .entry.active:last-child,
2207+.header-bar .linked .entry:focused:last-child,
2208+.header-bar .linked .entry:focused:active:last-child,
2209+.header-bar .linked .entry:insensitive:last-child,
2210+.header-bar .raised.linked .button:last-child,
2211+.header-bar .raised.linked .button:active:last-child,
2212+.header-bar .raised.linked .button:focus:last-child,
2213+.header-bar .raised.linked .button:focus:active:last-child,
2214+.header-bar .raised.linked .button:insensitive:last-child,
2215+.header-bar .raised.linked .button:backdrop:last-child,
2216 .inline-toolbar.toolbar .button:last-child,
2217 .inline-toolbar.toolbar .button:active:last-child,
2218 .inline-toolbar.toolbar .button:focus:last-child,
2219@@ -2123,6 +2396,34 @@
2220 .primary-toolbar.toolbar GtkToolButton:only-child .button:insensitive,
2221 .primary-toolbar.toolbar GtkToolButton:only-child .button:backdrop,
2222 .primary-toolbar.toolbar GtkToolButton:only-child .button:backdrop:insensitive,
2223+.menubar.toolbar.toolbar .button:only-child,
2224+.menubar.toolbar.toolbar .button:active:only-child,
2225+.menubar.toolbar.toolbar .button:focus:only-child,
2226+.menubar.toolbar.toolbar .button:focus:active:only-child,
2227+.menubar.toolbar.toolbar .button:insensitive:only-child,
2228+.menubar.toolbar.toolbar .button:backdrop:only-child,
2229+.menubar.toolbar.toolbar .button:backdrop:insensitive:only-child,
2230+.menubar.toolbar.toolbar GtkToolButton:only-child .button,
2231+.menubar.toolbar.toolbar GtkToolButton:only-child .button:active,
2232+.menubar.toolbar.toolbar GtkToolButton:only-child .button:focus,
2233+.menubar.toolbar.toolbar GtkToolButton:only-child .button:focus:active,
2234+.menubar.toolbar.toolbar GtkToolButton:only-child .button:insensitive,
2235+.menubar.toolbar.toolbar GtkToolButton:only-child .button:backdrop,
2236+.menubar.toolbar.toolbar GtkToolButton:only-child .button:backdrop:insensitive,
2237+.header-bar .button:only-child,
2238+.header-bar .button:active:only-child,
2239+.header-bar .button:focus:only-child,
2240+.header-bar .button:focus:active:only-child,
2241+.header-bar .button:insensitive:only-child,
2242+.header-bar .button:backdrop:only-child,
2243+.header-bar .button:backdrop:insensitive:only-child,
2244+.header-bar GtkToolButton:only-child .button,
2245+.header-bar GtkToolButton:only-child .button:active,
2246+.header-bar GtkToolButton:only-child .button:focus,
2247+.header-bar GtkToolButton:only-child .button:focus:active,
2248+.header-bar GtkToolButton:only-child .button:insensitive,
2249+.header-bar GtkToolButton:only-child .button:backdrop,
2250+.header-bar GtkToolButton:only-child .button:backdrop:insensitive,
2251 .inline-toolbar.toolbar .button:only-child,
2252 .inline-toolbar.toolbar .button:active:only-child,
2253 .inline-toolbar.toolbar .button:focus:only-child,

Subscribers

People subscribed via source and target branches