Merge lp:~l3on/ubuntu-themes/gnome-shell-fixes into lp:ubuntu-themes

Proposed by Leo Iannacone on 2014-04-03
Status: Needs review
Proposed branch: lp:~l3on/ubuntu-themes/gnome-shell-fixes
Merge into: lp:ubuntu-themes
Diff against target: 6151 lines (+1939/-874)
23 files modified
Ambiance/gtk-3.0/apps/gnome-applications.css (+30/-10)
Ambiance/gtk-3.0/apps/gnome-panel.css (+5/-1)
Ambiance/gtk-3.0/apps/gnome-terminal.css (+4/-2)
Ambiance/gtk-3.0/apps/nautilus.css (+6/-2)
Ambiance/gtk-3.0/apps/unity-greeter.css (+8/-2)
Ambiance/gtk-3.0/apps/unity.css (+21/-14)
Ambiance/gtk-3.0/gtk-main.css (+4/-0)
Ambiance/gtk-3.0/gtk-widgets-assets.css (+225/-34)
Ambiance/gtk-3.0/gtk-widgets-borders.css (+71/-24)
Ambiance/gtk-3.0/gtk-widgets.css (+530/-217)
Ambiance/metacity-1/metacity-theme-1.xml (+21/-137)
Radiance/gtk-3.0/apps/gnome-panel.css (+5/-1)
Radiance/gtk-3.0/apps/nautilus.css (+6/-2)
Radiance/gtk-3.0/apps/unity.css (+10/-2)
Radiance/gtk-3.0/gtk-main.css (+4/-0)
Radiance/gtk-3.0/gtk-widgets-assets-radiance.css (+15/-5)
Radiance/gtk-3.0/gtk-widgets-assets.css (+222/-35)
Radiance/gtk-3.0/gtk-widgets-backdrop.css (+105/-12)
Radiance/gtk-3.0/gtk-widgets-borders-radiance.css (+16/-4)
Radiance/gtk-3.0/gtk-widgets-borders.css (+71/-24)
Radiance/gtk-3.0/gtk-widgets-radiance.css (+13/-1)
Radiance/gtk-3.0/gtk-widgets.css (+529/-215)
Radiance/metacity-1/metacity-theme-1.xml (+18/-130)
To merge this branch: bzr merge lp:~l3on/ubuntu-themes/gnome-shell-fixes
Reviewer Review Type Date Requested Status
Alberts Muktupāvels (community) Needs Fixing on 2014-12-21
Lars Karlitski 2014-12-21 Pending
Ubuntu Artwork Packagers 2014-04-03 Pending
Review via email: mp+214003@code.launchpad.net

Description of the change

Hi all,

in gnome-shell applications using gtk3 windows (like nautilus, gnome-tweak-tools and many more)
are not resizeable.

A bug report is here: https://bugs.launchpad.net/ubuntu-themes/+bug/1263317

It seems adding some margin on .window-frame fixes resize issue.

I have also added a shadow on gtk-3 windows and a border-radius (with padding) on headbars.

To post a comment you must log in.
378. By Leo Iannacone on 2014-04-03

added shadow and border radius to gtk-3 windows

379. By Leo Iannacone on 2014-04-03

padding a bit on headbar

380. By Leo Iannacone on 2014-04-03

no need to have border-radius on titlebar just on header-bar, increased border-radius on window-frame, needed to cover backgorund-color

381. By Leo Iannacone on 2014-04-03

lighter shadow on window backgrop

382. By Leo Iannacone on 2014-04-03

use for window-frame shadows same values of unity. exported those colors in gtk-main

383. By Leo Iannacone on 2014-04-04

set same style between unity and header-bar

384. By Leo Iannacone on 2014-04-04

do not use frame - use window-frame instead

385. By Leo Iannacone on 2014-04-05

titlebar as header-bar with same style of unity

386. By Leo Iannacone on 2014-04-05

added titlebar also in widgets definitions

387. By Leo Iannacone on 2014-07-19

[ Michal Hruby ]
* Fixes issue where when using suru theme - icons present in ubuntu-
  mobile aren't found when trying to use them on the desktop.
[ Michał Sawicz ]
* Mark packages Multi-Arch: foreign to fix cross-building.
[ Lars Uebernickel ]
* Fixes required by the 3.12 update Unify notebook borders and
  paddings to get rid of the border around tab bars (on notebooks and
  stand-alone, such as in gedit and gnome-terminal). Also, style
  header bars similarly to window title bars, but take care that
  header bars that are used as tool bars keep the same look as tool
  bars.
[ Matthieu James ]
* New icons for the messaging menu (the names remain the same). New
  symbolic icons corresponding to different types of file (that can be
  download from the browser). New generic website icon. Fix a
  misspelled icon name (transfer indicator) (LP: #1289465)
[ Matthieu James ]
* Added a sample JSON file to build lists of icons and modified app
  icons according to the standardized colour palette. (LP: #1289465)
[ Robert Ancell ]
* Make ubuntu-mobile inherit from the Humanity / gnome themes. In the
  Unity 8 desktop session some applications refer to icons in these
  themes and this causes Unity 8 not to show an icon for them.
[ Lars Uebernickel ]
* Add preliminary support for popovers Add borders and shadow for the
  .popover class. Also set the background color for the .background
  class instead of on GtkWindow directly, because GtkPopover sets
  .background as well. (LP: #1329792)
[ Tim Peeters ]
* New back icon in ubuntu-mobile theme (LP: #1317519)
[ William Hua ]
* Refresh indicator-keyboard icons to include some missing layouts
  like Moldavian, Marathi (KaGaPa phonetic), and Sanskrit (KaGaPa
  phonetic). (LP: #1299402)

388. By Leo Iannacone on 2014-08-23

[ Matthieu James ]
* Added new icons for bluetooth devices and collapse/expand view (LP:
  #1289465)
[ Matthieu James ]
* Added new icons for bluetooth devices (LP: #1289465)

389. By Leo Iannacone on 2014-08-25

fix double comment closing

390. By Leo Iannacone on 2014-09-02

add semi-suport to gedit document sidebar

391. By Leo Iannacone on 2014-09-02

padding on gedit sidebar rows

392. By Leo Iannacone on 2014-09-02

button spacing set to 0 for dialog windows

393. By Leo Iannacone on 2014-09-06

add support to Radiance

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

I've given to this a first look and it seems very good...
However, in order to match the unity defined shadows you should use this:

.window-frame {
    border-radius: 10px 10px 0 0;
    box-shadow: 2px 10px 30px @window_shadow;

    /* this is used for the resize cursor area */
    margin: 10px;
}

.window-frame:backdrop {
    box-shadow: 2px 10px 25px @window_shadow_inactive;
}

Then, we've a problem... At least in unity: what in unity is a toolbar, using this theme becomes an headerbar and thus here it looks like we've two headers, which is something we can't go with.

So, I'm not sure weather it's the case of fixing nautilus or adding some special theming for Nautilus. I've noticed that using the Adwaita theme this problem doesn't happen here.

Leo Iannacone (l3on) wrote :

> I've given to this a first look and it seems very good...

Great!

> However, in order to match the unity defined shadows you should use this:
>
> .window-frame {
> border-radius: 10px 10px 0 0;
> box-shadow: 2px 10px 30px @window_shadow;
>
> /* this is used for the resize cursor area */
> margin: 10px;
> }
>
> .window-frame:backdrop {
> box-shadow: 2px 10px 25px @window_shadow_inactive;
> }

I tried, but I got an unexpected result. It seems blur effect used by GTK is not the same used by Unity. So, if you set the same values (@window_shadow*) you get different result.
It was true when I worked on windows, and I guess it's still so.

> Then, we've a problem... At least in unity: what in unity is a toolbar, using
> this theme becomes an headerbar and thus here it looks like we've two headers,
> which is something we can't go with.
> So, I'm not sure weather it's the case of fixing nautilus or adding some
> special theming for Nautilus.

Yes. You are right.
But the problem here is in Nautilus itself. The patch applied in the software (if I am not wrong) checks if current session is Unity, and if so, encloses the gtk-headerbar in a simple container.
The result is: you have a headerbar, supposed to be the "top-of-the-window", but displayed inside of it.
So, in this case, we have to review that patch (precisely: nautilus/debian/patches/ubuntu_show_titlebar.patch).

> I've noticed that using the Adwaita theme this
> problem doesn't happen here.
Only because in Adwaita headerbar and the other widgets use (more or less) the same colors.

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

> > However, in order to match the unity defined shadows you should use this:
> >
> > .window-frame {
> > border-radius: 10px 10px 0 0;
> > box-shadow: 2px 10px 30px @window_shadow;
> >
> > /* this is used for the resize cursor area */
> > margin: 10px;
> > }
> >
> > .window-frame:backdrop {
> > box-shadow: 2px 10px 25px @window_shadow_inactive;
> > }
>
> I tried, but I got an unexpected result. It seems blur effect used by GTK is
> not the same used by Unity. So, if you set the same values (@window_shadow*)
> you get different result.
> It was true when I worked on windows, and I guess it's still so.

Yeah, that's true. However using the values above I get exactly the same results (well, more or less :)), so I think you can safely use that I think.

> Yes. You are right.
> But the problem here is in Nautilus itself. The patch applied in the software
> (if I am not wrong) checks if current session is Unity, and if so, encloses
> the gtk-headerbar in a simple container.
> The result is: you have a headerbar, supposed to be the "top-of-the-window",
> but displayed inside of it.
> So, in this case, we have to review that patch (precisely:
> nautilus/debian/patches/ubuntu_show_titlebar.patch).

Right... Do you have time to check that or should I go?

Leo Iannacone (l3on) wrote :

> > I tried, but I got an unexpected result. It seems blur effect used by GTK is
> > not the same used by Unity. So, if you set the same values (@window_shadow*)
> > you get different result.
> > It was true when I worked on windows, and I guess it's still so.
>
> Yeah, that's true. However using the values above I get exactly the same
> results (well, more or less :)), so I think you can safely use that I think.

Ok, I will set that value.

About nautilus:
> > So, in this case, we have to review that patch (precisely:
> > nautilus/debian/patches/ubuntu_show_titlebar.patch).
>
> Right... Do you have time to check that or should I go?

I tried to remove '.header-bar' class from Nautilus toolbar. It just does not work, since you want "a dark bar" there, instead the result is:
http://i.imgur.com/bq8dXRb.png

So, I think the ways to fix this can be approximately two:
 1. Providing a theme hack to Nautilus, overriding the default style of ".header-bar"
 2. Otherwise, push into nautilus (and maybe more apps?) a ".header-bar.no-titlebar" style_class and then work on directly on css -> .no-titlebar

394. By Leo Iannacone on 2014-10-01

use same shadow values of Unity

395. By Leo Iannacone on 2014-10-01

[ Lars Uebernickel ]
* Ambiance/Radiance: style popover menus correctly
[ Charles Kerr ]
* Revert the suru theme's message indicators back to the earlier
  'envelope' look. (LP: #1367817)

396. By Leo Iannacone on 2014-10-15

fix GtkListBox rows styles - were displayed as buttons

397. By Leo Iannacone on 2014-10-16

[ Lars Uebernickel ]
* Mark Ambiance and Radiance to use overlay scrollbars
* gtk3 theme: fix gedit's search bar
* Gtk theme: expose public colors with Adwaita's naming scheme

398. By Leo Iannacone on 2014-10-17

remove trough from metacity - more similiar to unity

399. By Leo Iannacone on 2014-10-17

bigger title bar

400. By Leo Iannacone on 2014-10-17

metacity: time to go borderless

401. By Leo Iannacone on 2014-10-17

metacity: Ambiance - draw title following unity choices

402. By Leo Iannacone on 2014-10-18

fix typo

403. By Leo Iannacone on 2014-10-18

treat any :checked selector as :active

404. By Leo Iannacone on 2014-10-18

metacity: title height and button spacing like in unity

405. By Leo Iannacone on 2014-10-19

revert title vertical pad to 10 - fit default titlebar font and size in ubuntu-settings package

406. By Leo Iannacone on 2014-10-19

Fix typos

407. By Leo Iannacone on 2014-10-21

title bar margin left and right set to 7px - as unity does

408. By Leo Iannacone on 2014-10-21

experimental transition effect with buttons

409. By Leo Iannacone on 2014-10-21

Fix row-buttons:backdrop:hover

410. By Leo Iannacone on 2014-10-21

Add support to button.flat

411. By Leo Iannacone on 2014-10-21

check and radio buttons in Gtk 3.14 want assets as -gtk-icon-source rather than a background-image

412. By Leo Iannacone on 2014-10-21

fix spinner - code from Adwaita 3.14

413. By Leo Iannacone on 2014-10-21

better support to link buttons

414. By Leo Iannacone on 2014-10-21

better support to linked buttons

415. By Leo Iannacone on 2014-10-21

a bit of .app-notification style

416. By Leo Iannacone on 2014-10-21

only link buttons needs this

417. By Leo Iannacone on 2014-10-21

reset transition over popover menuitem

Dmitry Shachnev (mitya57) wrote :

We need to move forward with this as currently gnome-panel theming is broken (since the last update).

Alberts Muktupāvels (muktupavels) wrote :

Text conflict in Ambiance/gtk-3.0/gtk-widgets-assets.css
Text conflict in Ambiance/gtk-3.0/gtk-widgets-borders.css
Text conflict in Ambiance/gtk-3.0/gtk-widgets.css
Text conflict in Radiance/gtk-3.0/gtk-widgets-assets.css
Text conflict in Radiance/gtk-3.0/gtk-widgets-borders-radiance.css
Text conflict in Radiance/gtk-3.0/gtk-widgets-borders.css
Text conflict in Radiance/gtk-3.0/gtk-widgets.css

review: Needs Fixing

Unmerged revisions

417. By Leo Iannacone on 2014-10-21

reset transition over popover menuitem

416. By Leo Iannacone on 2014-10-21

only link buttons needs this

415. By Leo Iannacone on 2014-10-21

a bit of .app-notification style

414. By Leo Iannacone on 2014-10-21

better support to linked buttons

413. By Leo Iannacone on 2014-10-21

better support to link buttons

412. By Leo Iannacone on 2014-10-21

fix spinner - code from Adwaita 3.14

411. By Leo Iannacone on 2014-10-21

check and radio buttons in Gtk 3.14 want assets as -gtk-icon-source rather than a background-image

410. By Leo Iannacone on 2014-10-21

Add support to button.flat

409. By Leo Iannacone on 2014-10-21

Fix row-buttons:backdrop:hover

408. By Leo Iannacone on 2014-10-21

experimental transition effect with buttons

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ambiance/gtk-3.0/apps/gnome-applications.css'
2--- Ambiance/gtk-3.0/apps/gnome-applications.css 2012-08-08 13:46:38 +0000
3+++ Ambiance/gtk-3.0/apps/gnome-applications.css 2014-10-21 15:21:37 +0000
4@@ -60,7 +60,8 @@
5 text-shadow: 1 1 black;
6 }
7
8-.nautilus-desktop.nautilus-canvas-item:active {
9+.nautilus-desktop.nautilus-canvas-item:active,
10+.nautilus-desktop.nautilus-canvas-item:checked {
11 color: @theme_text_color;
12 }
13
14@@ -69,6 +70,7 @@
15 }
16
17 .nautilus-desktop.nautilus-canvas-item:active,
18+.nautilus-desktop.nautilus-canvas-item:checked,
19 .nautilus-desktop.nautilus-canvas-item:prelight,
20 .nautilus-desktop.nautilus-canvas-item:selected {
21 text-shadow: none;
22@@ -215,8 +217,11 @@
23 }
24
25 .documents-dropdown .radio:active,
26+.documents-dropdown .radio:checked,
27 .documents-dropdown .radio:active:focused,
28-.documents-dropdown .radio:active:prelight {
29+.documents-dropdown .radio:checked:focused,
30+.documents-dropdown .radio:active:prelight,
31+.documents-dropdown .radio:checked:prelight {
32 background-image: url("assets/sidebar-radio-checked.svg");
33 }
34
35@@ -225,7 +230,9 @@
36 }
37
38 .documents-dropdown .radio:active:selected,
39-.documents-dropdown .radio:active:selected:focused {
40+.documents-dropdown .radio:checked:selected,
41+.documents-dropdown .radio:active:selected:focused,
42+.documents-dropdown .radio:checked:selected:focused {
43 background-image: url("assets/sidebar-radio-selected.svg");
44 }
45
46@@ -287,7 +294,9 @@
47 }
48
49 .documents-selection-mode.toolbar .button:active,
50-.documents-selection-mode.toolbar .button:hover:active {
51+.documents-selection-mode.toolbar .button:checked,
52+.documents-selection-mode.toolbar .button:hover:active,
53+.documents-selection-mode.toolbar .button:hover:checked {
54 background-image: -gtk-gradient(linear, left top, left bottom,
55 from(@documents_selection_button_b),
56 to(shade(@documents_selection_button_a, 0.90)));
57@@ -356,7 +365,8 @@
58
59 .documents-osd .toolbar .button,
60 .documents-osd .toolbar .button:prelight,
61-.documents-osd .toolbar .button:active {
62+.documents-osd .toolbar .button:active,
63+.documents-osd .toolbar .button:checked {
64 background-color: transparent;
65 }
66
67@@ -394,7 +404,9 @@
68 }
69
70 .documents-osd .toolbar .button:active,
71-.documents-osd .toolbar .button:active:hover {
72+.documents-osd .toolbar .button:checked,
73+.documents-osd .toolbar .button:active:hover,
74+.documents-osd .toolbar .button:checked:hover {
75 background-image: -gtk-gradient(linear, left top, left bottom,
76 from(alpha(@documents_osd_button_b, 0.18)),
77 color-stop(0.68, alpha(@documents_osd_button_a, 0.23)),
78@@ -425,7 +437,9 @@
79 .documents-entry-tag.button,
80 .documents-entry-tag.button:hover,
81 .documents-entry-tag.button:active,
82-.documents-entry-tag.button:active:hover {
83+.documents-entry-tag.button:checked,
84+.documents-entry-tag.button:active:hover,
85+.documents-entry-tag.button:checked:hover {
86 background-color: transparent;
87 background-image: none;
88 border-image: none;
89@@ -492,7 +506,9 @@
90 }
91
92 EphyToolbar .location-entry .button:active,
93-EphyToolbar .location-entry .button:active:hover {
94+EphyToolbar .location-entry .button:checked,
95+EphyToolbar .location-entry .button:active:hover,
96+EphyToolbar .location-entry .button:checked:hover {
97 background-image: -gtk-gradient(linear, left top, left bottom,
98 from(shade(@entry_background_a, 0.9)),
99 to(@entry_background_b));
100@@ -504,7 +520,9 @@
101 EphyToolbar .location-entry .button:hover,
102 EphyToolbar .location-entry .button:focus,
103 EphyToolbar .location-entry .button:active,
104-EphyToolbar .location-entry .button *:active {
105+EphyToolbar .location-entry .button:checked,
106+EphyToolbar .location-entry .button *:active,
107+EphyToolbar .location-entry .button *:checked {
108 color: @theme_text_color;
109 }
110
111@@ -596,7 +614,8 @@
112 background-color: @selected_bg_color;
113 }
114
115-.contacts-button:active {
116+.contacts-button:active,
117+.contacts-button:checked {
118 border-color: #000000;
119 border-image: none;
120 }
121@@ -660,6 +679,7 @@
122
123 /* Gucharmap */
124 GucharmapChartable:active,
125+GucharmapChartable:checked,
126 GucharmapChartable:focus,
127 GucharmapChartable:selected {
128 background-color: @theme_selected_bg_color;
129
130=== modified file 'Ambiance/gtk-3.0/apps/gnome-panel.css'
131--- Ambiance/gtk-3.0/apps/gnome-panel.css 2013-07-10 16:38:17 +0000
132+++ Ambiance/gtk-3.0/apps/gnome-panel.css 2014-10-21 15:21:37 +0000
133@@ -69,9 +69,13 @@
134 }
135
136 PanelApplet .button:active:prelight:backdrop,
137+PanelApplet .button:checked:prelight:backdrop,
138 PanelApplet .button:active:prelight,
139+PanelApplet .button:checked:prelight,
140 PanelApplet .button:active:backdrop,
141-PanelApplet .button:active {
142+PanelApplet .button:checked:backdrop,
143+PanelApplet .button:active,
144+PanelApplet .button:checked {
145 border-image: none;
146 background-image: -gtk-gradient (linear, left top, left bottom,
147 from (shade (@dark_bg_color, 0.85)),
148
149=== modified file 'Ambiance/gtk-3.0/apps/gnome-terminal.css'
150--- Ambiance/gtk-3.0/apps/gnome-terminal.css 2011-08-10 18:33:27 +0000
151+++ Ambiance/gtk-3.0/apps/gnome-terminal.css 2014-10-21 15:21:37 +0000
152@@ -41,7 +41,8 @@
153 -unico-inner-stroke-color: alpha (shade (@dark_bg_color, 1.26), 0.2);
154 }
155
156-TerminalWindow .notebook tab:active {
157+TerminalWindow .notebook tab:active,
158+TerminalWindow .notebook tab:checked {
159 background-image: -gtk-gradient (linear, left top, left bottom,
160 from (shade (@dark_bg_color, 1.2)),
161 to (shade (@dark_bg_color, 1.12)));
162@@ -50,7 +51,8 @@
163 }
164
165 TerminalWindow .notebook .button,
166-TerminalWindow .notebook .button:active {
167+TerminalWindow .notebook .button:active ,
168+TerminalWindow .notebook .button:checked {
169 background-image: -gtk-gradient (linear, left top, right top,
170 from (shade (@dark_bg_color, 1.08)),
171 to (shade (@dark_bg_color, 0.92)));
172
173=== modified file 'Ambiance/gtk-3.0/apps/nautilus.css'
174--- Ambiance/gtk-3.0/apps/nautilus.css 2014-07-10 15:06:44 +0000
175+++ Ambiance/gtk-3.0/apps/nautilus.css 2014-10-21 15:21:37 +0000
176@@ -18,7 +18,8 @@
177 text-shadow: 1px 1px alpha (#000000, 0.8);
178 }
179
180-.nautilus-desktop.nautilus-canvas-item:active {
181+.nautilus-desktop.nautilus-canvas-item:active,
182+.nautilus-desktop.nautilus-canvas-item:checked {
183 background-image: none;
184 background-color: alpha (@bg_color, 0.84);
185
186@@ -33,6 +34,7 @@
187 }
188
189 .nautilus-desktop.nautilus-canvas-item:active,
190+.nautilus-desktop.nautilus-canvas-item:checked,
191 .nautilus-desktop.nautilus-canvas-item:prelight,
192 .nautilus-desktop.nautilus-canvas-item:selected {
193 text-shadow: none;
194@@ -88,7 +90,9 @@
195 }
196
197 #nautilus-search-button *:active,
198-#nautilus-search-button *:active:prelight {
199+#nautilus-search-button *:checked,
200+#nautilus-search-button *:active:prelight,
201+#nautilus-search-button *:checked:prelight {
202 color: @dark_fg_color;
203 }
204
205
206=== modified file 'Ambiance/gtk-3.0/apps/unity-greeter.css'
207--- Ambiance/gtk-3.0/apps/unity-greeter.css 2013-02-01 18:14:58 +0000
208+++ Ambiance/gtk-3.0/apps/unity-greeter.css 2014-10-21 15:21:37 +0000
209@@ -18,7 +18,9 @@
210
211 .lightdm.menu .menuitem *,
212 .lightdm.menu .menuitem.check:active,
213-.lightdm.menu .menuitem.radio:active {
214+.lightdm.menu .menuitem.check:checked,
215+.lightdm.menu .menuitem.radio:active,
216+.lightdm.menu .menuitem.radio:checked {
217 color: white;
218 }
219
220@@ -46,11 +48,15 @@
221 .lightdm.button,
222 .lightdm.button:hover,
223 .lightdm.button:active,
224+.lightdm.button:checked,
225 .lightdm.button:active:focused,
226+.lightdm.button:checked:focused,
227 .lightdm.entry,
228 .lightdm.entry:hover,
229 .lightdm.entry:active,
230-.lightdm.entry:active:focused {
231+.lightdm.entry:checked,
232+.lightdm.entry:active:focused,
233+.lightdm.entry:checked:focused {
234 background-image: none;
235 border-image: none;
236 }
237
238=== modified file 'Ambiance/gtk-3.0/apps/unity.css'
239--- Ambiance/gtk-3.0/apps/unity.css 2014-03-31 20:51:28 +0000
240+++ Ambiance/gtk-3.0/apps/unity.css 2014-10-21 15:21:37 +0000
241@@ -6,9 +6,9 @@
242
243 -UnityDecoration-shadow-offset-x: 1px;
244 -UnityDecoration-shadow-offset-y: 5px;
245- -UnityDecoration-active-shadow-color: rgba (0, 0, 0, 0.75);
246+ -UnityDecoration-active-shadow-color: @window_shadow;
247 -UnityDecoration-active-shadow-radius: 30px;
248- -UnityDecoration-inactive-shadow-color: rgba (0, 0, 0, 0.3);
249+ -UnityDecoration-inactive-shadow-color: @window_shadow_inactive;
250 -UnityDecoration-inactive-shadow-radius: 25px;
251
252 -UnityDecoration-glow-size: 10px;
253@@ -19,25 +19,32 @@
254 -UnityDecoration-title-alignment: 0.0;
255 }
256
257+.titlebar,
258+.header-bar,
259 UnityDecoration.top {
260 border: 1px solid rgba (0, 3, 5, 0.03); /* shade (@dark_bg_color, 1.04) - shade (@dark_bg_color, 1.5) */
261 border-bottom-width: 0;
262 border-radius: 6px 6px 0 0;
263+
264+ box-shadow: inset 0 0 transparent, inset 0 0 transparent,
265+ inset 0 1px shade (@dark_bg_color, 1.6), inset 0 0 transparent;
266+
267+ background-color: transparent;
268+ background-clip: border-box;
269+ background-image: -gtk-gradient (linear, left top, left bottom,
270+ from (shade (@dark_bg_color, 1.5)),
271+ to (shade (@dark_bg_color, 1.04)));
272+
273+ color: @dark_fg_color;
274+ text-shadow: 1px 0 #333, -1px 0 #333, 0 1px #333, 0 -1px #333;
275+}
276+
277+UnityDecoration.top {
278 padding: 1px 6px 0 6px;
279-
280- box-shadow: inset 0 0 transparent, inset 0 0 transparent,
281- inset 0 1px shade (@dark_bg_color, 1.6), inset 0 0 transparent;
282-
283- background-color: transparent;
284- background-clip: border-box;
285- background-image: -gtk-gradient (linear, left top, left bottom,
286- from (shade (@dark_bg_color, 1.5)),
287- to (shade (@dark_bg_color, 1.04)));
288-
289- color: @dark_fg_color;
290- text-shadow: 1px 0 #333, -1px 0 #333, 0 1px #333, 0 -1px #333;
291 }
292
293+.titlebar:backdrop,
294+.header-bar:backdrop,
295 UnityDecoration.top:backdrop {
296 border: 1px solid rgba (14, 13, 0, 0.03); /* @dark_bg_color - shade (#474642, 0.92) */;
297 border-bottom-width: 0;
298
299=== modified file 'Ambiance/gtk-3.0/gtk-main.css'
300--- Ambiance/gtk-3.0/gtk-main.css 2014-10-13 14:58:41 +0000
301+++ Ambiance/gtk-3.0/gtk-main.css 2014-10-21 15:21:37 +0000
302@@ -37,6 +37,10 @@
303
304 @define-color shadow_color alpha(black, 0.5);
305
306+/* window decoration colors */
307+@define-color window_shadow rgba (0, 0, 0, 0.75);
308+@define-color window_shadow_inactive rgba (0, 0, 0, 0.3);
309+
310 @import url("gtk-widgets-borders.css");
311 @import url("gtk-widgets-assets.css");
312 @import url("gtk-widgets.css");
313
314=== modified file 'Ambiance/gtk-3.0/gtk-widgets-assets.css'
315--- Ambiance/gtk-3.0/gtk-widgets-assets.css 2013-07-28 23:01:08 +0000
316+++ Ambiance/gtk-3.0/gtk-widgets-assets.css 2014-10-21 15:21:37 +0000
317@@ -5,6 +5,7 @@
318 .grip {
319 background-color: transparent;
320 /*background-image: url("assets/resize-grip.svg");*/
321+ /*-gtk-icon-source: url("assets/resize-grip.svg");*/
322 }
323
324 /*************************
325@@ -19,26 +20,31 @@
326
327 .check {
328 background-image: url("assets/check-unselected.png");
329+ -gtk-icon-source: url("assets/check-unselected.png");
330 }
331
332 .check:hover {
333 background-image: url("assets/check-unselected-hover.png");
334+ -gtk-icon-source: url("assets/check-unselected-hover.png");
335 }
336
337 .check row,
338 .check row:selected,
339 .check row:selected:focus {
340 background-image: url("assets/check-unselected-alt.png");
341+ -gtk-icon-source: url("assets/check-unselected-alt.png");
342 }
343
344 .check row:hover,
345 .check row:selected:hover,
346 .check row:selected:focus:hover {
347 background-image: url("assets/check-unselected-hover-alt.png");
348+ -gtk-icon-source: url("assets/check-unselected-hover-alt.png");
349 }
350
351 .check:insensitive {
352 background-image: url("assets/check-unselected-disabled.png");
353+ -gtk-icon-source: url("assets/check-unselected-disabled.png");
354 }
355
356 .check row:insensitive {
357@@ -50,168 +56,224 @@
358 .check row:selected:focus:insensitive {
359 background-color: transparent;
360 background-image: url("assets/check-unselected-disabled-alt.png");
361+ -gtk-icon-source: url("assets/check-unselected-disabled-alt.png");
362 }
363
364 .check:backdrop {
365 background-image: url("assets/backdrop-check-unselected.png");
366+ -gtk-icon-source: url("assets/backdrop-check-unselected.png");
367 }
368
369 .check:hover:backdrop {
370 background-image: url("assets/backdrop-check-unselected-hover.png");
371+ -gtk-icon-source: url("assets/backdrop-check-unselected-hover.png");
372 }
373
374 .check row:backdrop,
375 .check row:selected:backdrop {
376 background-image: url("assets/backdrop-check-unselected-alt.png");
377+ -gtk-icon-source: url("assets/backdrop-check-unselected-alt.png");
378 }
379
380 .check row:hover:backdrop,
381 .check row:selected:hover:backdrop {
382 background-image: url("assets/backdrop-check-unselected-hover-alt.png");
383+ -gtk-icon-source: url("assets/backdrop-check-unselected-hover-alt.png");
384 }
385
386 .check:insensitive:backdrop {
387 background-image: url("assets/backdrop-check-unselected-disabled.png");
388+ -gtk-icon-source: url("assets/backdrop-check-unselected-disabled.png");
389 }
390
391 .check row:selected:insensitive:backdrop {
392 background-image: url("assets/backdrop-check-unselected-disabled-alt.png");
393+ -gtk-icon-source: url("assets/backdrop-check-unselected-disabled-alt.png");
394 }
395
396-.check:active {
397+.check:active,
398+.check:checked {
399 background-image: url("assets/check-selected.png");
400+ -gtk-icon-source: url("assets/check-selected.png");
401 }
402
403-.check:active:hover {
404+.check:active:hover,
405+.check:checked:hover {
406 background-image: url("assets/check-selected-hover.png");
407+ -gtk-icon-source: url("assets/check-selected-hover.png");
408 }
409
410 .check row:active,
411+.check row:checked,
412 .check row:selected:active,
413-.check row:selected:focus:active {
414+.check row:selected:checked,
415+.check row:selected:focus:active,
416+.check row:selected:focus:checked {
417 background-image: url("assets/check-selected-alt.png");
418+ -gtk-icon-source: url("assets/check-selected-alt.png");
419 }
420
421 .check row:active:hover,
422+.check row:checked:hover,
423 .check row:selected:active:hover,
424-.check row:selected:active:focus:hover {
425+.check row:selected:checked:hover,
426+.check row:selected:active:focus:hover,
427+.check row:selected:checked:focus:hover {
428 background-image: url("assets/check-selected-hover-alt.png");
429+ -gtk-icon-source: url("assets/check-selected-hover-alt.png");
430 }
431
432-.check:active:insensitive {
433+.check:active:insensitive,
434+.check:checked:insensitive {
435 background-image: url("assets/check-selected-disabled.png");
436+ -gtk-icon-source: url("assets/check-selected-disabled.png");
437 }
438
439 .check row:active:insensitive,
440+.check row:checked:insensitive,
441 .check row:selected:active:insensitive,
442-.check row:selected:focus:active:insensitive {
443+.check row:selected:checked:insensitive,
444+.check row:selected:focus:active:insensitive,
445+.check row:selected:focus:checked:insensitive {
446 background-image: url("assets/check-selected-disabled-alt.png");
447+ -gtk-icon-source: url("assets/check-selected-disabled-alt.png");
448 }
449
450-.check:active:backdrop {
451+.check:active:backdrop,
452+.check:checked:backdrop {
453 background-image: url("assets/backdrop-check-selected.png");
454+ -gtk-icon-source: url("assets/backdrop-check-selected.png");
455 }
456
457-.check:active:backdrop {
458+.check:active:backdrop,
459+.check:checked:backdrop {
460 background-image: url("assets/backdrop-check-selected-hover.png");
461+ -gtk-icon-source: url("assets/backdrop-check-selected-hover.png");
462 }
463
464 .check row:active:backdrop,
465-.check row:selected:active:backdrop {
466+.check row:checked:backdrop,
467+.check row:selected:active:backdrop,
468+.check row:selected:checked:backdrop {
469 background-image: url("assets/backdrop-check-selected-alt.png");
470+ -gtk-icon-source: url("assets/backdrop-check-selected-alt.png");
471 }
472
473 .check row:active:hover:backdrop,
474-.check row:selected:active:hover:backdrop {
475+.check row:checked:hover:backdrop,
476+.check row:selected:active:hover:backdrop,
477+.check row:selected:checked:hover:backdrop {
478 background-image: url("assets/backdrop-check-selected-hover-alt.png");
479+ -gtk-icon-source: url("assets/backdrop-check-selected-hover-alt.png");
480 }
481
482-.check:active:insensitive:backdrop {
483+.check:active:insensitive:backdrop,
484+.check:checked:insensitive:backdrop {
485 background-image: url("assets/backdrop-check-selected-disabled.png");
486+ -gtk-icon-source: url("assets/backdrop-check-selected-disabled.png");
487 }
488
489-.check row:selected:active:insensitive:backdrop {
490+.check row:selected:active:insensitive:backdrop,
491+.check row:selected:checked:insensitive:backdrop {
492 background-image: url("assets/backdrop-check-selected-disabled-alt.png");
493+ -gtk-icon-source: url("assets/backdrop-check-selected-disabled-alt.png");
494 }
495
496 .check:inconsistent {
497 background-image: url("assets/check-mixed.png");
498+ -gtk-icon-source: url("assets/check-mixed.png");
499 }
500
501 .check:inconsistent:hover {
502 background-image: url("assets/check-mixed-hover.png");
503+ -gtk-icon-source: url("assets/check-mixed-hover.png");
504 }
505
506 .check row:inconsistent,
507 .check row:selected:inconsistent,
508 .check row:selected:focus:inconsistent {
509 background-image: url("assets/check-mixed-alt.png");
510+ -gtk-icon-source: url("assets/check-mixed-alt.png");
511 }
512
513 .check row:inconsistent:hover,
514 .check row:selected:inconsistent:hover,
515 .check row:selected:focus:inconsistent:hover {
516 background-image: url("assets/check-mixed-hover-alt.png");
517+ -gtk-icon-source: url("assets/check-mixed-hover-alt.png");
518 }
519
520 .check:inconsistent:insensitive {
521 background-image: url("assets/check-mixed-disabled.png");
522+ -gtk-icon-source: url("assets/check-mixed-disabled.png");
523 }
524
525 .check row:inconsistent:insensitive,
526 .check row:selected:inconsistent:insensitive,
527 .check row:selected:focus:inconsistent:insensitive {
528 background-image: url("assets/check-mixed-disabled-alt.png");
529+ -gtk-icon-source: url("assets/check-mixed-disabled-alt.png");
530 }
531
532 .check:inconsistent:backdrop {
533 background-image: url("assets/backdrop-check-mixed.png");
534+ -gtk-icon-source: url("assets/backdrop-check-mixed.png");
535 }
536
537 .check:inconsistent:hover:backdrop {
538 background-image: url("assets/backdrop-check-mixed-hover.png");
539+ -gtk-icon-source: url("assets/backdrop-check-mixed-hover.png");
540 }
541
542 .check row:inconsistent:backdrop,
543 .check row:selected:inconsistent:backdrop {
544 background-image: url("assets/backdrop-check-mixed-alt.png");
545+ -gtk-icon-source: url("assets/backdrop-check-mixed-alt.png");
546 }
547
548 .check row:inconsistent:hover:backdrop,
549 .check row:selected:inconsistent:hover:backdrop {
550 background-image: url("assets/backdrop-check-mixed-hover-alt.png");
551+ -gtk-icon-source: url("assets/backdrop-check-mixed-hover-alt.png");
552 }
553
554 .check:inconsistent:insensitive:backdrop {
555 background-image: url("assets/backdrop-check-mixed-disabled.png");
556+ -gtk-icon-source: url("assets/backdrop-check-mixed-disabled.png");
557 }
558
559 .check row:selected:inconsistent:insensitive:backdrop {
560 background-image: url("assets/backdrop-check-mixed-disabled-alt.png");
561+ -gtk-icon-source: url("assets/backdrop-check-mixed-disabled-alt.png");
562 }
563
564 .radio {
565 background-image: url("assets/radio-unselected.png");
566+ -gtk-icon-source: url("assets/radio-unselected.png");
567 }
568
569 .radio:hover {
570 background-image: url("assets/radio-unselected-hover.png");
571+ -gtk-icon-source: url("assets/radio-unselected-hover.png");
572 }
573
574 .radio row,
575 .radio row:selected,
576 .radio row:selected:focus {
577 background-image: url("assets/radio-unselected-alt.png");
578+ -gtk-icon-source: url("assets/radio-unselected-alt.png");
579 }
580
581 .radio row:hover,
582 .radio row:selected:hover,
583 .radio row:selected:focus:hover {
584 background-image: url("assets/radio-unselected-hover-alt.png");
585+ -gtk-icon-source: url("assets/radio-unselected-hover-alt.png");
586 }
587
588 .radio:insensitive {
589 background-image: url("assets/radio-unselected-disabled.png");
590+ -gtk-icon-source: url("assets/radio-unselected-disabled.png");
591 }
592
593 .radio row:insensitive {
594@@ -222,164 +284,223 @@
595 .radio row:selected:insensitive,
596 .radio row:selected:focus:insensitive {
597 background-image: url("assets/radio-unselected-disabled-alt.png");
598+ -gtk-icon-source: url("assets/radio-unselected-disabled-alt.png");
599 }
600
601 .radio:backdrop {
602 background-image: url("assets/backdrop-radio-unselected.png");
603+ -gtk-icon-source: url("assets/backdrop-radio-unselected.png");
604 }
605
606 .radio:hover:backdrop {
607 background-image: url("assets/backdrop-radio-unselected-hover.png");
608+ -gtk-icon-source: url("assets/backdrop-radio-unselected-hover.png");
609 }
610
611 .radio row:backdrop,
612 .radio row:selected:backdrop {
613 background-image: url("assets/backdrop-radio-unselected-alt.png");
614+ -gtk-icon-source: url("assets/backdrop-radio-unselected-alt.png");
615 }
616
617 .radio row:hover:backdrop,
618 .radio row:selected:hover:backdrop {
619 background-image: url("assets/backdrop-radio-unselected-hover-alt.png");
620+ -gtk-icon-source: url("assets/backdrop-radio-unselected-hover-alt.png");
621 }
622
623 .radio:insensitive:backdrop {
624 background-image: url("assets/backdrop-radio-unselected-disabled.png");
625+ -gtk-icon-source: url("assets/backdrop-radio-unselected-disabled.png");
626 }
627
628 .radio row:selected:insensitive:backdrop {
629 background-image: url("assets/backdrop-radio-unselected-disabled-alt.png");
630+ -gtk-icon-source: url("assets/backdrop-radio-unselected-disabled-alt.png");
631 }
632
633-.radio:active {
634+.radio:active,
635+.radio:checked {
636 background-image: url("assets/radio-selected.png");
637+ -gtk-icon-source: url("assets/radio-selected.png");
638 }
639
640-.radio:active:hover {
641+.radio:active:hover,
642+.radio:checked:hover {
643 background-image: url("assets/radio-selected-hover.png");
644+ -gtk-icon-source: url("assets/radio-selected-hover.png");
645 }
646
647 .radio row:active,
648+.radio row:checked,
649 .radio row:selected:active,
650-.radio row:selected:focus:active {
651+.radio row:selected:checked,
652+.radio row:selected:focus:active,
653+.radio row:selected:focus:checked {
654 background-image: url("assets/radio-selected-alt.png");
655+ -gtk-icon-source: url("assets/radio-selected-alt.png");
656 }
657
658 .radio row:active:hover,
659+.radio row:checked:hover,
660 .radio row:selected:active:hover,
661-.radio row:selected:focus:active:hover {
662+.radio row:selected:checked:hover,
663+.radio row:selected:focus:active:hover,
664+.radio row:selected:focus:checked:hover {
665 background-image: url("assets/radio-selected-hover-alt.png");
666+ -gtk-icon-source: url("assets/radio-selected-hover-alt.png");
667 }
668
669-.radio:active:insensitive {
670+.radio:active:insensitive,
671+.radio:checked:insensitive {
672 background-image: url("assets/radio-selected-disabled.png");
673+ -gtk-icon-source: url("assets/radio-selected-disabled.png");
674 }
675
676 .radio row:insensitive,
677 .radio row:selected:active:insensitive,
678-.radio row:selected:focus:active:insensitive {
679+.radio row:selected:checked:insensitive,
680+.radio row:selected:focus:active:insensitive,
681+.radio row:selected:focus:checked:insensitive {
682 background-image: url("assets/radio-selected-disabled-alt.png");
683+ -gtk-icon-source: url("assets/radio-selected-disabled-alt.png");
684 }
685
686-.radio:active:backdrop {
687+.radio:active:backdrop,
688+.radio:checked:backdrop {
689 background-image: url("assets/backdrop-radio-selected.png");
690+ -gtk-icon-source: url("assets/backdrop-radio-selected.png");
691 }
692
693-.radio:active:hover:backdrop {
694+.radio:active:hover:backdrop,
695+.radio:checked:hover:backdrop {
696 background-image: url("assets/backdrop-radio-selected-hover.png");
697+ -gtk-icon-source: url("assets/backdrop-radio-selected-hover.png");
698 }
699
700 .radio row:active:backdrop,
701-.radio row:selected:active:backdrop {
702+.radio row:checked:backdrop,
703+.radio row:selected:active:backdrop,
704+.radio row:selected:checked:backdrop {
705 background-image: url("assets/backdrop-radio-selected-alt.png");
706+ -gtk-icon-source: url("assets/backdrop-radio-selected-alt.png");
707 }
708
709 .radio row:active:hover:backdrop,
710-.radio row:selected:active:hover:backdrop {
711+.radio row:checked:hover:backdrop,
712+.radio row:selected:active:hover:backdrop,
713+.radio row:selected:checked:hover:backdrop {
714 background-image: url("assets/backdrop-radio-selected-hover-alt.png");
715+ -gtk-icon-source: url("assets/backdrop-radio-selected-hover-alt.png");
716 }
717
718-.radio:active:insensitive:backdrop {
719+.radio:active:insensitive:backdrop,
720+.radio:checked:insensitive:backdrop {
721 background-image: url("assets/backdrop-radio-selected-disabled.png");
722+ -gtk-icon-source: url("assets/backdrop-radio-selected-disabled.png");
723 }
724
725-.radio row:selected:active:insensitive:backdrop {
726+.radio row:selected:active:insensitive:backdrop,
727+.radio row:selected:checked:insensitive:backdrop {
728 background-image: url("assets/backdrop-radio-selected-disabled-alt.png");
729+ -gtk-icon-source: url("assets/backdrop-radio-selected-disabled-alt.png");
730 }
731
732 .radio:inconsistent {
733 background-image: url("assets/radio-mixed.png");
734+ -gtk-icon-source: url("assets/radio-mixed.png");
735 }
736
737 .radio:inconsistent:hover {
738 background-image: url("assets/radio-mixed-hover.png");
739+ -gtk-icon-source: url("assets/radio-mixed-hover.png");
740 }
741
742 .radio row:inconsistent,
743 .radio row:selected:inconsistent,
744 .radio row:selected:focus:inconsistent {
745 background-image: url("assets/radio-mixed-alt.png");
746+ -gtk-icon-source: url("assets/radio-mixed-alt.png");
747 }
748
749 .radio row:inconsistent:hover,
750 .radio row:selected:inconsistent:hover,
751 .radio row:selected:focus:inconsistent:hover {
752 background-image: url("assets/radio-mixed-hover-alt.png");
753+ -gtk-icon-source: url("assets/radio-mixed-hover-alt.png");
754 }
755
756 .radio:inconsistent:insensitive {
757 background-image: url("assets/radio-mixed-disabled.png");
758+ -gtk-icon-source: url("assets/radio-mixed-disabled.png");
759 }
760
761 .radio row:inconsistent:insensitive,
762 .radio row:selected:inconsistent:insensitive,
763 .radio row:selected:focus:inconsistent:insensitive {
764 background-image: url("assets/radio-mixed-disabled-alt.png");
765+ -gtk-icon-source: url("assets/radio-mixed-disabled-alt.png");
766 }
767
768 .radio:inconsistent:backdrop {
769 background-image: url("assets/backdrop-radio-mixed.png");
770+ -gtk-icon-source: url("assets/backdrop-radio-mixed.png");
771 }
772
773 .radio:inconsistent:hover:backdrop {
774 background-image: url("assets/backdrop-radio-mixed-hover.png");
775+ -gtk-icon-source: url("assets/backdrop-radio-mixed-hover.png");
776 }
777
778 .radio row:inconsistent:backdrop,
779 .radio row:selected:inconsistent:backdrop {
780 background-image: url("assets/backdrop-radio-mixed-alt.png");
781+ -gtk-icon-source: url("assets/backdrop-radio-mixed-alt.png");
782 }
783
784 .radio row:inconsistent:hover:backdrop,
785 .radio row:selected:inconsistent:hover:backdrop {
786 background-image: url("assets/backdrop-radio-mixed-hover-alt.png");
787+ -gtk-icon-source: url("assets/backdrop-radio-mixed-hover-alt.png");
788 }
789
790 .radio:inconsistent:insensitive:backdrop {
791 background-image: url("assets/backdrop-radio-mixed-disabled.png");
792+ -gtk-icon-source: url("assets/backdrop-radio-mixed-disabled.png");
793 }
794
795 .radio row:selected:inconsistent:insensitive:backdrop {
796 background-image: url("assets/backdrop-radio-mixed-disabled-alt.png");
797+ -gtk-icon-source: url("assets/backdrop-radio-mixed-disabled-alt.png");
798 }
799
800 /*.sidebar .radio:active,
801+.sidebar .radio:checked,
802 .sidebar .radio:active:focus,
803-.sidebar .radio:active:hover {
804+.sidebar .radio:checked:focus,
805+.sidebar .radio:active:hover,
806+.sidebar .radio:checked:hover {
807 background-image: url("assets/sidebar-radio-selected.svg");
808+ -gtk-icon-source: url("assets/sidebar-radio-selected.svg");
809 }
810
811 .sidebar .radio:hover {
812 background-image: url("assets/sidebar-radio-prelight.svg");
813+ -gtk-icon-source: url("assets/sidebar-radio-prelight.svg");
814 }
815
816 .sidebar .radio:active:selected,
817-.sidebar .radio:active:selected:focus {
818+.sidebar .radio:checked:selected,
819+.sidebar .radio:active:selected:focus,
820+.sidebar .radio:checked:selected:focus {
821 background-image: url("assets/sidebar-radio-selected.svg");
822+ -gtk-icon-source: url("assets/sidebar-radio-selected.svg");
823 }
824
825 .sidebar .radio:selected:hover,
826 .sidebar .radio:selected:focus {
827 background-image: url("assets/sidebar-radio-selected-prelight.svg");
828+ -gtk-icon-source: url("assets/sidebar-radio-selected-prelight.svg");
829 }*/
830
831 .primary-toolbar .menu .check,
832@@ -387,6 +508,7 @@
833 .header-bar .menu .check,
834 .menu .check {
835 background-image: url("assets/check-menuitem-unselected.png");
836+ -gtk-icon-source: url("assets/check-menuitem-unselected.png");
837 }
838
839 .primary-toolbar .menu .radio,
840@@ -394,66 +516,105 @@
841 .header-bar .menu .radio,
842 .menu .radio {
843 background-image: url("assets/check-menuitem-unselected.png");
844+ -gtk-icon-source: url("assets/check-menuitem-unselected.png");
845 }
846
847 .primary-toolbar .menu .check:active,
848+.primary-toolbar .menu .check:checked,
849 .menubar.toolbar .menu .check:active,
850+.menubar.toolbar .menu .check:checked,
851 .header-bar .menu .check:active,
852+.header-bar .menu .check:checked,
853 .toolbar .menu .check:active:hover,
854+.toolbar .menu .check:checked:hover,
855 .menu .check:active,
856-.menu .check:active:hover {
857+.menu .check:checked,
858+.menu .check:active:hover,
859+.menu .check:checked:hover {
860 background-image: url("assets/check-menuitem.png");
861+ -gtk-icon-source: url("assets/check-menuitem.png");
862 }
863
864 .primary-toolbar .menu .check:active:insensitive,
865+.primary-toolbar .menu .check:checked:insensitive,
866 .menubar.toolbar .menu .check:active:insensitive,
867+.menubar.toolbar .menu .check:checked:insensitive,
868 .header-bar .menu .check:active:insensitive,
869+.header-bar .menu .check:checked:insensitive,
870 .toolbar .menu .check:active:hover:insensitive,
871+.toolbar .menu .check:checked:hover:insensitive,
872 .menu .check:active:insensitive,
873-.menu .check:active:hover:insensitive {
874+.menu .check:checked:insensitive,
875+.menu .check:active:hover:insensitive,
876+.menu .check:checked:hover:insensitive {
877 background-image: url("assets/check-menuitem-insensitive.png");
878+ -gtk-icon-source: url("assets/check-menuitem-insensitive.png");
879 }
880
881 .primary-toolbar .menu .radio:active,
882+.primary-toolbar .menu .radio:checked,
883 .menubar.toolbar .menu .radio:active,
884+.menubar.toolbar .menu .radio:checked,
885 .header-bar .menu .radio:active,
886+.header-bar .menu .radio:checked,
887 .toolbar .menu .radio:active:hover,
888+.toolbar .menu .radio:checked:hover,
889 .menu .radio:active,
890-.menu .radio:active:hover {
891+.menu .radio:checked,
892+.menu .radio:active:hover,
893+.menu .radio:checked:hover {
894 background-image: url("assets/radio-menuitem.png");
895+ -gtk-icon-source: url("assets/radio-menuitem.png");
896 }
897
898 .primary-toolbar .menu .radio:active:insensitive,
899+.primary-toolbar .menu .radio:checked:insensitive,
900 .menubar.toolbar .menu .radio:active:insensitive,
901+.menubar.toolbar .menu .radio:checked:insensitive,
902 .header-bar .menu .radio:active:insensitive,
903+.header-bar .menu .radio:checked:insensitive,
904 .toolbar .menu .radio:active:hover:insensitive,
905+.toolbar .menu .radio:checked:hover:insensitive,
906 .menu .radio:active:insensitive,
907-.menu .radio:active:hover:insensitive {
908+.menu .radio:checked:insensitive,
909+.menu .radio:active:hover:insensitive,
910+.menu .radio:checked:hover:insensitive {
911 background-image: url("assets/radio-menuitem-insensitive.png");
912+ -gtk-icon-source: url("assets/radio-menuitem-insensitive.png");
913 }
914
915 .toolbar .menu .check {
916 background-image: url("assets/check-menuitem-unselected.png");
917+ -gtk-icon-source: url("assets/check-menuitem-unselected.png");
918 }
919
920 .toolbar .menu .radio {
921 background-image: url("assets/check-menuitem-unselected.png");
922+ -gtk-icon-source: url("assets/check-menuitem-unselected.png");
923 }
924
925-.toolbar .menu .check:active {
926+.toolbar .menu .check:active,
927+.toolbar .menu .check:checked {
928 background-image: url("assets/check-menuitem-dark.png");
929+ -gtk-icon-source: url("assets/check-menuitem-dark.png");
930 }
931
932-.toolbar .menu .check:active:insensitive {
933+.toolbar .menu .check:active:insensitive,
934+.toolbar .menu .check:checked:insensitive {
935 background-image: url("assets/check-menuitem-insensitive-dark.png");
936+ -gtk-icon-source: url("assets/check-menuitem-insensitive-dark.png");
937 }
938
939-.toolbar .menu .radio:active {
940+.toolbar .menu .radio:active,
941+.toolbar .menu .radio:checked {
942 background-image: url("assets/radio-menuitem-dark.png");
943+ -gtk-icon-source: url("assets/radio-menuitem-dark.png");
944 }
945
946-.toolbar .menu .radio:active:insensitive {
947+.toolbar .menu .radio:active:insensitive,
948+.toolbar .menu .radio:checked:insensitive {
949 background-image: url("assets/radio-menuitem-insensitive-dark.png");
950+ -gtk-icon-source: url("assets/radio-menuitem-insensitive-dark.png");
951 }
952
953 /*********************
954@@ -462,127 +623,157 @@
955 .scale.slider,
956 .scale.slider.horizontal {
957 background-image: url("assets/slider-horizontal.png");
958+ -gtk-icon-source: url("assets/slider-horizontal.png");
959 }
960
961 .scale.slider:backdrop,
962 .scale.slider.horizontal:backdrop {
963 /*background-image: url("assets/slider-horizontal-disabled.png");*/
964+ /*-gtk-icon-source: url("assets/slider-horizontal-disabled.png");*/
965 }
966
967 .scale.slider:hover,
968 .scale.slider.horizontal:hover {
969 background-image: url("assets/slider-horizontal-hover.png");
970+ -gtk-icon-source: url("assets/slider-horizontal-hover.png");
971 }
972
973 .scale.slider:focused,
974 .scale.slider.horizontal:focused {
975 background-image: url("assets/slider-horizontal-focused.png");
976+ -gtk-icon-source: url("assets/slider-horizontal-focused.png");
977 }
978
979 .scale.slider:hover:focused,
980 .scale.slider.horizontal:hover:focused {
981 background-image: url("assets/slider-horizontal-focused-hover.png");
982+ -gtk-icon-source: url("assets/slider-horizontal-focused-hover.png");
983 }
984
985 .scale.slider:insensitive,
986 .scale.slider.horizontal:insensitive {
987 background-image: url("assets/slider-horizontal-disabled.png");
988+ -gtk-icon-source: url("assets/slider-horizontal-disabled.png");
989 }
990
991 .scale.slider:insensitive:backdrop,
992 .scale.slider.horizontal:insensitive:backdrop {
993 /*background-image: url("assets/slider-horizontal-backdrop-disabled.png");*/
994+ /*-gtk-icon-source: url("assets/slider-horizontal-backdrop-disabled.png");*/
995 }
996
997 .scale.slider.vertical {
998 background-image: url("assets/slider-vertical.png");
999+ -gtk-icon-source: url("assets/slider-vertical.png");
1000 }
1001
1002 .scale.slider.vertical:backdrop {
1003 /*background-image: url("assets/slider-vertical-backdrop.png");*/
1004+ /*-gtk-icon-source: url("assets/slider-vertical-backdrop.png");*/
1005 }
1006
1007 .scale.slider.vertical:hover {
1008 background-image: url("assets/slider-vertical-hover.png");
1009+ -gtk-icon-source: url("assets/slider-vertical-hover.png");
1010 }
1011
1012 .scale.slider.vertical:focused {
1013 background-image: url("assets/slider-vertical-focused.png");
1014+ -gtk-icon-source: url("assets/slider-vertical-focused.png");
1015 }
1016
1017 .scale.slider.vertical:hover:focused {
1018 background-image: url("assets/slider-vertical-focused-hover.png");
1019+ -gtk-icon-source: url("assets/slider-vertical-focused-hover.png");
1020 }
1021
1022 .scale.slider.vertical:insensitive {
1023 background-image: url("assets/slider-vertical-disabled.png");
1024+ -gtk-icon-source: url("assets/slider-vertical-disabled.png");
1025 }
1026
1027 .scale.slider.vertical:insensitive:backdrop {
1028 /*background-image: url("assets/slider-vertical-backdrop-disabled.png");*/
1029+ /*-gtk-icon-source: url("assets/slider-vertical-backdrop-disabled.png");*/
1030 }
1031
1032 /*.scale.scale-has-marks-above.slider.horizontal {
1033 background-image: url("assets/slider-up.png");
1034+ -gtk-icon-source: url("assets/slider-up.png");
1035 }
1036
1037 .scale.scale-has-marks-above.slider.horizontal:insensitive {
1038 background-image: url("assets/slider-up-disabled.png");
1039+ -gtk-icon-source: url("assets/slider-up-disabled.png");
1040 }
1041
1042 .scale.scale-has-marks-above.slider.horizontal:backdrop {
1043 background-image: url("assets/slider-up-backdrop.png");
1044+ -gtk-icon-source: url("assets/slider-up-backdrop.png");
1045 }
1046
1047 .scale.scale-has-marks-above.slider.horizontal:backdrop:insensitive {
1048 background-image: url("assets/slider-up-backdrop-disabled.png");
1049+ -gtk-icon-source: url("assets/slider-up-backdrop-disabled.png");
1050 }
1051
1052 .scale.scale-has-marks-above.slider.vertical {
1053 background-image: url("assets/slider-left.png");
1054+ -gtk-icon-source: url("assets/slider-left.png");
1055 }
1056
1057 .scale.scale-has-marks-above.slider.vertical:insensitive {
1058 background-image: url("assets/slider-left-disabled.png");
1059+ -gtk-icon-source: url("assets/slider-left-disabled.png");
1060 }
1061
1062 .scale.scale-has-marks-above.slider.vertical:backdrop {
1063 background-image: url("assets/slider-left-backdrop.png");
1064+ -gtk-icon-source: url("assets/slider-left-backdrop.png");
1065 }
1066
1067 .scale.scale-has-marks-above.slider.vertical:backdrop:insensitive {
1068 background-image: url("assets/slider-left-backdrop-disabled.png");
1069+ -gtk-icon-source: url("assets/slider-left-backdrop-disabled.png");
1070 }
1071
1072 .scale.scale-has-marks-below.slider.horizontal {
1073 background-image: url("assets/slider-down.png");
1074+ -gtk-icon-source: url("assets/slider-down.png");
1075 }
1076
1077 .scale.scale-has-marks-below.slider.horizontal:insensitive {
1078 background-image: url("assets/slider-down-disabled.png");
1079+ -gtk-icon-source: url("assets/slider-down-disabled.png");
1080 }
1081
1082 .scale.scale-has-marks-below.slider.horizontal:backdrop {
1083 background-image: url("assets/slider-down-backdrop.png");
1084+ -gtk-icon-source: url("assets/slider-down-backdrop.png");
1085 }
1086
1087 .scale.scale-has-marks-below.slider.horizontal:backdrop:insensitive {
1088 background-image: url("assets/slider-down-backdrop-disabled.png");
1089+ -gtk-icon-source: url("assets/slider-down-backdrop-disabled.png");
1090 }
1091
1092 .scale.scale-has-marks-below.slider.vertical {
1093 background-image: url("assets/slider-right.png");
1094+ -gtk-icon-source: url("assets/slider-right.png");
1095 }
1096
1097 .scale.scale-has-marks-below.slider.vertical:insensitive {
1098 background-image: url("assets/slider-right-disabled.png");
1099+ -gtk-icon-source: url("assets/slider-right-disabled.png");
1100 }
1101
1102 .scale.scale-has-marks-below.slider.vertical:backdrop {
1103 background-image: url("assets/slider-right-backdrop.png");
1104+ -gtk-icon-source: url("assets/slider-right-backdrop.png");
1105 }
1106
1107 .scale.scale-has-marks-below.slider.vertical:backdrop:insensitive {
1108 background-image: url("assets/slider-right-backdrop-disabled.png");
1109+ -gtk-icon-source: url("assets/slider-right-backdrop-disabled.png");
1110 }*/
1111
1112
1113=== modified file 'Ambiance/gtk-3.0/gtk-widgets-borders.css'
1114--- Ambiance/gtk-3.0/gtk-widgets-borders.css 2014-01-02 22:13:06 +0000
1115+++ Ambiance/gtk-3.0/gtk-widgets-borders.css 2014-10-21 15:21:37 +0000
1116@@ -11,8 +11,11 @@
1117 .entry:focus,
1118 GtkComboBox.combobox-entry .entry:focus,
1119 .button:focus:active,
1120+.button:focus:checked,
1121 .button.default:active,
1122-GtkSwitch.trough:active {
1123+.button.default:checked,
1124+GtkSwitch.trough:active,
1125+GtkSwitch.trough:checked {
1126 }
1127
1128 /**********
1129@@ -57,35 +60,43 @@
1130 border-image: url("assets/backdrop-button-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1131 }
1132
1133-.button:active {
1134+.button:active,
1135+.button:checked {
1136 border-image: url("assets/button-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1137 }
1138
1139-.button:active:backdrop {
1140+.button:active:backdrop,
1141+.button:checked:backdrop {
1142 border-image: url("assets/backdrop-button-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1143 }
1144
1145-.button:active:hover {
1146+.button:active:hover,
1147+.button:checked:hover {
1148 border-image: url("assets/button-active-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1149 }
1150
1151-.button:active:hover:backdrop {
1152+.button:active:hover:backdrop,
1153+.button:checked:hover:backdrop {
1154 border-image: url("assets/backdrop-button-active-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1155 }
1156
1157-.button:active:focus {
1158+.button:active:focus,
1159+.button:checked:focus {
1160 border-image: url("assets/button-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1161 }
1162
1163-.button:active:hover:focus {
1164+.button:active:hover:focus,
1165+.button:checked:hover:focus {
1166 border-image: url("assets/button-active-focused-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1167 }
1168
1169-.button:active:insensitive {
1170+.button:active:insensitive,
1171+.button:checked:insensitive {
1172 border-image: url("assets/button-active-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1173 }
1174
1175-.button:active:insensitive:backdrop {
1176+.button:active:insensitive:backdrop,
1177+.button:checked:insensitive:backdrop {
1178 border-image: url("assets/backdrop-button-active-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1179 }
1180
1181@@ -109,7 +120,10 @@
1182
1183 .primary-toolbar .button,
1184 .menubar.toolbar .button,
1185-.header-bar .button {
1186+.header-bar .button,
1187+.primary-toolbar .button.flat:hover,
1188+.menubar.toolbar .button.flat:hover,
1189+.header-bar .button.flat:hover {
1190 border-image: url("assets/button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1191 }
1192
1193@@ -120,14 +134,20 @@
1194 }
1195
1196 .primary-toolbar .button:active,
1197+.primary-toolbar .button:checked,
1198 .menubar.toolbar .button:active,
1199-.header-bar .button:active {
1200+.menubar.toolbar .button:checked,
1201+.header-bar .button:active,
1202+.header-bar .button:checked {
1203 border-image: url("assets/button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1204 }
1205
1206 .primary-toolbar .button:active:focused,
1207+.primary-toolbar .button:checked:focused,
1208 .menubar.toolbar .button:active:focused,
1209-.header-bar .button:active:focused {
1210+.menubar.toolbar .button:checked:focused,
1211+.header-bar .button:active:focused,
1212+.header-bar .button:checked:focused {
1213 border-image: url("assets/button-toolbar-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1214 }
1215
1216@@ -138,11 +158,21 @@
1217 }
1218
1219 .primary-toolbar .button:active:backdrop,
1220+.primary-toolbar .button:checked:backdrop,
1221 .menubar.toolbar .button:active:backdrop,
1222-.header-bar .button:active:backdrop {
1223+.menubar.toolbar .button:checked:backdrop,
1224+.header-bar .button:active:backdrop,
1225+.header-bar .button:checked:backdrop {
1226 border-image: url("assets/backdrop-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1227 }
1228
1229+.button.flat,
1230+.button.flat:backdrop,
1231+GtkLinkButton.button.flat:hover,
1232+GtkLinkButton.button.flat:active:hover {
1233+ border-image: none;
1234+}
1235+
1236 .menubar.menuitem:hover,
1237 .menubar .menuitem:hover {
1238 border: 1px solid #2e2e2c;
1239@@ -240,7 +270,8 @@
1240 border-image: url("assets/backdrop-combobox-button-disabled.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
1241 }
1242
1243-GtkComboBox.combobox-entry .button:active:focus {
1244+GtkComboBox.combobox-entry .button:active:focus,
1245+GtkComboBox.combobox-entry .button:checked:focus {
1246 border-image: url("assets/combobox-button-pressed-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
1247 }
1248
1249@@ -260,8 +291,11 @@
1250 }
1251
1252 .primary-toolbar GtkComboBox.combobox-entry .button:focus:active:focus,
1253+.primary-toolbar GtkComboBox.combobox-entry .button:focus:checked:focus,
1254 .menubar.toolbar GtkComboBox.combobox-entry .button:focus:active:focus,
1255-.header-bar GtkComboBox.combobox-entry .button:focus:active:focus {
1256+.menubar.toolbar GtkComboBox.combobox-entry .button:focus:checked:focus,
1257+.header-bar GtkComboBox.combobox-entry .button:focus:active:focus,
1258+.header-bar GtkComboBox.combobox-entry .button:focus:checked:focus {
1259 border-image: url("assets/combobox-button-toolbar-pressed-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
1260 }
1261
1262@@ -287,19 +321,23 @@
1263 border-left-width: 0;
1264 }
1265
1266-.notebook tab.top:active {
1267+.notebook tab.top:active,
1268+.notebook tab.top:checked {
1269 border-image: url("assets/notebook-tab-top.png") 8 10 1 10 / 8px 10px 1px 10px stretch;
1270 }
1271
1272-.notebook tab.right:active {
1273+.notebook tab.right:active,
1274+.notebook tab.right:checked {
1275 border-image: url("assets/notebook-tab-right.png") 10 8 10 1 / 10px 8px 10px 1px stretch;
1276 }
1277
1278-.notebook tab.bottom:active {
1279+.notebook tab.bottom:active,
1280+.notebook tab.bottom:checked {
1281 border-image: url("assets/notebook-tab-bottom.png") 1 10 8 10 / 1px 10px 8px 10px stretch;
1282 }
1283
1284-.notebook tab.left:active {
1285+.notebook tab.left:active,
1286+.notebook tab.left:checked {
1287 border-image: url("assets/notebook-tab-left.png") 10 1 10 8 / 10px 1px 10px 8px stretch;
1288 }
1289
1290@@ -327,7 +365,8 @@
1291 border-image: url("assets/switch-trough-off.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1292 }
1293
1294-GtkSwitch.trough:active {
1295+GtkSwitch.trough:active,
1296+GtkSwitch.trough:checked {
1297 border-image: url("assets/switch-trough-on.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1298 }
1299
1300@@ -338,16 +377,21 @@
1301 }
1302
1303 .primary-toolbar GtkSwitch.trough:active,
1304+.primary-toolbar GtkSwitch.trough:checked,
1305 .menubar.toolbar GtkSwitch.trough:active,
1306-.header-bar GtkSwitch.trough:active {
1307+.menubar.toolbar GtkSwitch.trough:checked,
1308+.header-bar GtkSwitch.trough:active,
1309+.header-bar GtkSwitch.trough:checked {
1310 border-image: url("assets/switch-trough-toolbar-on.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1311 }
1312
1313 /* XXX temporary */
1314 GtkSwitch.trough:backdrop,
1315 GtkSwitch.trough:active:backdrop,
1316+GtkSwitch.trough:checked:backdrop,
1317 GtkSwitch.trough:insensitive,
1318-GtkSwitch.trough:active:insensitive {
1319+GtkSwitch.trough:active:insensitive,
1320+GtkSwitch.trough:checked:insensitive {
1321 border-image: url("assets/switch-trough-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
1322 }
1323
1324@@ -355,7 +399,8 @@
1325 border-image: url("assets/switch-button-off.png") 9 11 9 11 / 9px 11px 9px 11px stretch;
1326 }
1327
1328-GtkSwitch.slider:active {
1329+GtkSwitch.slider:active,
1330+GtkSwitch.slider:checked {
1331 border-image: url("assets/switch-button-on.png") 9 11 9 11 / 9px 11px 9px 11px stretch;
1332 }
1333
1334@@ -367,7 +412,9 @@
1335
1336 /* XXX temporary */
1337 GtkSwitch.slider:active:backdrop,
1338-GtkSwitch.slider:active:insensitive {
1339+GtkSwitch.slider:checked:backdrop,
1340+GtkSwitch.slider:active:insensitive,
1341+GtkSwitch.slider:checked:insensitive {
1342 border-image: url("assets/switch-button-on-disabled.png") 9 11 9 11 / 9px 11px 9px 11px stretch;
1343 }
1344
1345
1346=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
1347--- Ambiance/gtk-3.0/gtk-widgets.css 2014-10-13 14:58:41 +0000
1348+++ Ambiance/gtk-3.0/gtk-widgets.css 2014-10-21 15:21:37 +0000
1349@@ -143,6 +143,7 @@
1350
1351 color: @fg_color;
1352 text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4);
1353+ transition: all 150ms ease-out;
1354 }
1355
1356 GtkSwitch.slider:backdrop,
1357@@ -159,6 +160,7 @@
1358 from (shade (@button_bg_color, 1.12)),
1359 color-stop (0.5, @button_bg_color),
1360 to (shade (@button_bg_color, 0.96)));
1361+ transition: all 200ms ease-out;
1362 }
1363
1364 .button:hover:backdrop {
1365@@ -180,30 +182,80 @@
1366 text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.2);
1367 }
1368
1369-.button:active {
1370+.button:active,
1371+.button:checked {
1372 background-image: -gtk-gradient (linear, left top, left bottom,
1373 from (#cecece),
1374 to (#e8e8e8));
1375+ transition: all 150ms ease-out;
1376 }
1377
1378-.button:active:hover {
1379+.button:active:hover,
1380+.button:checked:hover {
1381 background-image: -gtk-gradient (linear, left top, left bottom,
1382 from (#dcdcdc),
1383 to (#f3f3f3));
1384 }
1385
1386-.button:active:insensitive {
1387+.button:active:insensitive,
1388+.button:checked:insensitive {
1389 background-image: -gtk-gradient (linear, left top, left bottom,
1390 from (#e3e3e3),
1391 to (#f3f3f3));
1392 }
1393
1394-.button:active:insensitive:backdrop {
1395+.button:active:insensitive:backdrop,
1396+.button:checked:insensitive:backdrop {
1397 background-image: -gtk-gradient (linear, left top, left bottom,
1398 from (mix (#e3e3e3, @bg_color, 0.5)),
1399 to (mix (#f3f3f3, @bg_color, 0.5)));
1400 }
1401
1402+.button.flat,
1403+.button.flat:backdrop,
1404+GtkLinkButton.button:hover,
1405+GtkLinkButton.button:active:hover {
1406+ background-image: none;
1407+ background: none;
1408+}
1409+
1410+GtkLinkButton.button {
1411+ color: @selected_bg_color;
1412+}
1413+
1414+/* disable .button style from GtkListBox rows*/
1415+
1416+.button.list-row,
1417+.button.list-row:active,
1418+.button.list-row:checked {
1419+ background: transparent;
1420+ background-image: none;
1421+ text-shadow: none;
1422+}
1423+.button.list-row,
1424+.button.list-row:hover,
1425+.button.list-row:active:hover,
1426+.button.list-row:checked:hover {
1427+ border: none;
1428+ border-radius: 0;
1429+ background-color: @bg_color;
1430+}
1431+.button.list-row:selected,
1432+.button.list-row:selected:hover {
1433+ background-color: alpha (@selected_bg_color, 0.9);
1434+ color: @selected_fg_color;
1435+ text-shadow: 0 1px shade (@selected_bg_color, 0.8);
1436+}
1437+.button.list-row:selected:backdrop,
1438+.button.list-row:selected:hover:backdrop {
1439+ background-image: -gtk-gradient (linear, left top, left bottom,
1440+ from (shade (shade (@bg_color, 0.95), 0.94)),
1441+ to (shade (shade (@bg_color, 0.95), 0.86)));
1442+ border-top-color: shade (shade (@bg_color, 0.95), 0.88);
1443+ color: @fg_color;
1444+ text-shadow: 0 1px shade (shade (@bg_color, 0.95), 0.96);
1445+}
1446+
1447 /* default button */
1448
1449 /*
1450@@ -221,13 +273,15 @@
1451 to (mix (shade (@selected_bg_color, 0.89), @bg_color, 0.3)));
1452 }
1453
1454-.button.default:active {
1455+.button.default:active,
1456+.button.default:checked {
1457 background-image: -gtk-gradient (linear, left top, left bottom,
1458 from (mix (shade (@selected_bg_color, 0.95), @bg_color, 0.3)),
1459 to (mix (shade (@selected_bg_color, 1.05), @bg_color, 0.3)));
1460 }
1461
1462-.button.default:active:hover {
1463+.button.default:active:hover,
1464+.button.default:checked:hover {
1465 background-image: -gtk-gradient (linear, left top, left bottom,
1466 from (mix (shade (@selected_bg_color, 1.0), @bg_color, 0.3)),
1467 to (mix (shade (@selected_bg_color, 1.1), @bg_color, 0.3)));
1468@@ -260,10 +314,15 @@
1469 }
1470
1471 .linked .button:active,
1472+.linked .button:checked,
1473 .toolbar .button.raised.linked:active,
1474+.toolbar .button.raised.linked:checked,
1475 .toolbar .raised.linked .button:active,
1476+.toolbar .raised.linked .button:checked,
1477 .inline-toolbar.toolbar .button:active,
1478-.inline-toolbar.toolbar GtkToolButton .button:active {
1479+.inline-toolbar.toolbar .button:checked,
1480+.inline-toolbar.toolbar GtkToolButton .button:active,
1481+.inline-toolbar.toolbar GtkToolButton .button:checked {
1482 /*box-shadow: inset 1px 0 shade (@bg_color, 0.76);*/
1483 }
1484
1485@@ -293,18 +352,36 @@
1486
1487
1488 /* Middle button */
1489-.linked .entry,
1490-.linked .entry:active,
1491-.linked .entry:focus,
1492-.linked .entry:focus:active,
1493-.linked .button,
1494-.linked .button:active,
1495-.linked .button:active:hover,
1496-.linked .button:focus,
1497-.linked .button:focus:active,
1498-.linked .button:insensitive,
1499-.linked .button:backdrop,
1500-.linked .button:active:backdrop {
1501+.linked > .entry,
1502+.linked > .entry:active,
1503+.linked > .entry:checked,
1504+.linked > .entry:focus,
1505+.linked > .entry:focus:active,
1506+.linked > .entry:focus:checked,
1507+.linked > .button,
1508+.linked > .button:active,
1509+.linked > .button:checked,
1510+.linked > .button:active:hover,
1511+.linked > .button:checked:hover,
1512+.linked > .button:focus,
1513+.linked > .button:focus:active,
1514+.linked > .button:focus:checked,
1515+.linked > .button:insensitive,
1516+.linked > .button:backdrop,
1517+.linked > .button:active:backdrop,
1518+.linked > .button:checked:backdrop,
1519+.linked > GtkComboBox > .button,
1520+.linked > GtkComboBox > .button:active,
1521+.linked > GtkComboBox > .button:checked,
1522+.linked > GtkComboBox > .button:active:hover,
1523+.linked > GtkComboBox > .button:checked:hover,
1524+.linked > GtkComboBox > .button:focus,
1525+.linked > GtkComboBox > .button:focus:active,
1526+.linked > GtkComboBox > .button:focus:checked,
1527+.linked > GtkComboBox > .button:insensitive,
1528+.linked > GtkComboBox > .button:backdrop,
1529+.linked > GtkComboBox > .button:active:backdrop,
1530+.linked > GtkComboBox > .button:checked:backdrop {
1531 border-right-width: 0;
1532 border-left-width: 0;
1533 border-image-width: 10px 0 10px 0;
1534@@ -312,18 +389,36 @@
1535 }
1536
1537 /* Leftmost button */
1538-.linked .entry:first-child,
1539-.linked .entry:active:first-child,
1540-.linked .entry:focus:first-child,
1541-.linked .entry:focus:active:first-child,
1542-.linked .button:first-child,
1543-.linked .button:active:first-child,
1544-.linked .button:active:hover:first-child,
1545-.linked .button:focus:first-child,
1546-.linked .button:focus:active:first-child,
1547-.linked .button:insensitive:first-child,
1548-.linked .button:backdrop:first-child,
1549-.linked .button:active:backdrop:first-child {
1550+.linked > .entry:first-child,
1551+.linked > .entry:active:first-child,
1552+.linked > .entry:checked:first-child,
1553+.linked > .entry:focus:first-child,
1554+.linked > .entry:focus:active:first-child,
1555+.linked > .entry:focus:checked:first-child,
1556+.linked > .button:first-child,
1557+.linked > .button:active:first-child,
1558+.linked > .button:checked:first-child,
1559+.linked > .button:active:hover:first-child,
1560+.linked > .button:checked:hover:first-child,
1561+.linked > .button:focus:first-child,
1562+.linked > .button:focus:active:first-child,
1563+.linked > .button:focus:checked:first-child,
1564+.linked > .button:insensitive:first-child,
1565+.linked > .button:backdrop:first-child,
1566+.linked > .button:active:backdrop:first-child,
1567+.linked > .button:checked:backdrop:first-child,
1568+.linked > GtkComboBox:first-child > .button,
1569+.linked > GtkComboBox:first-child > .button:active,
1570+.linked > GtkComboBox:first-child > .button:checked,
1571+.linked > GtkComboBox:first-child > .button:active:hover,
1572+.linked > GtkComboBox:first-child > .button:checked:hover,
1573+.linked > GtkComboBox:first-child > .button:focus,
1574+.linked > GtkComboBox:first-child > .button:focus:active,
1575+.linked > GtkComboBox:first-child > .button:focus:checked,
1576+.linked > GtkComboBox:first-child > .button:insensitive,
1577+.linked > GtkComboBox:first-child > .button:backdrop,
1578+.linked > GtkComboBox:first-child > .button:active:backdrop,
1579+.linked > GtkComboBox:first-child > .button:checked:backdrop {
1580 border-width: 1px;
1581 border-right-width: 0;
1582 border-image-width: 10px 0 10px 12px;
1583@@ -333,18 +428,36 @@
1584 }
1585
1586 /* Rightmost button */
1587-.linked .entry:last-child,
1588-.linked .entry:active:last-child,
1589-.linked .entry:focus:last-child,
1590-.linked .entry:focus:active:last-child,
1591-.linked .button:last-child,
1592-.linked .button:active:last-child,
1593-.linked .button:active:hover:last-child,
1594-.linked .button:focus:last-child,
1595-.linked .button:focus:active:last-child,
1596-.linked .button:insensitive:last-child,
1597-.linked .button:backdrop:last-child,
1598-.linked .button:active:backdrop:last-child {
1599+.linked > .entry:last-child,
1600+.linked > .entry:active:last-child,
1601+.linked > .entry:checked:last-child,
1602+.linked > .entry:focus:last-child,
1603+.linked > .entry:focus:active:last-child,
1604+.linked > .entry:focus:checked:last-child,
1605+.linked > .button:last-child,
1606+.linked > .button:active:last-child,
1607+.linked > .button:checked:last-child,
1608+.linked > .button:active:hover:last-child,
1609+.linked > .button:checked:hover:last-child,
1610+.linked > .button:focus:last-child,
1611+.linked > .button:focus:active:last-child,
1612+.linked > .button:focus:checked:last-child,
1613+.linked > .button:insensitive:last-child,
1614+.linked > .button:backdrop:last-child,
1615+.linked > .button:active:backdrop:last-child,
1616+.linked > .button:checked:backdrop:last-child,
1617+.linked > GtkComboBox:last-child > .button,
1618+.linked > GtkComboBox:last-child > .button:active,
1619+.linked > GtkComboBox:last-child > .button:checked,
1620+.linked > GtkComboBox:last-child > .button:active:hover,
1621+.linked > GtkComboBox:last-child > .button:checked:hover,
1622+.linked > GtkComboBox:last-child > .button:focus,
1623+.linked > GtkComboBox:last-child > .button:focus:active,
1624+.linked > GtkComboBox:last-child > .button:focus:checked,
1625+.linked > GtkComboBox:last-child > .button:insensitive,
1626+.linked > GtkComboBox:last-child > .button:backdrop,
1627+.linked > GtkComboBox:last-child > .button:active:backdrop,
1628+.linked > GtkComboBox:last-child > .button:checked:backdrop {
1629 border-width: 1px;
1630 border-left-width: 0;
1631 border-image-width: 10px 12px 10px 0;
1632@@ -354,18 +467,88 @@
1633 }
1634
1635 /* Linked single button */
1636-.linked .entry:only-child,
1637-.linked .entry:active:only-child,
1638-.linked .entry:focus:only-child,
1639-.linked .entry:focus:active:only-child,
1640-.linked .button:only-child,
1641-.linked .button:active:only-child,
1642-.linked .button:active:hover:only-child,
1643-.linked .button:focus:only-child,
1644-.linked .button:focus:active:only-child,
1645-.linked .button:insensitive:only-child,
1646-.linked .button:backdrop:only-child,
1647-.linked .button:active:backdrop:only-child {
1648+.linked > .entry:only-child,
1649+.linked > .entry:active:only-child,
1650+.linked > .entry:checked:only-child,
1651+.linked > .entry:focus:only-child,
1652+.linked > .entry:focus:active:only-child,
1653+.linked > .entry:focus:checked:only-child,
1654+.linked > .button:only-child,
1655+.linked > .button:active:only-child,
1656+.linked > .button:checked:only-child,
1657+.linked > .button:active:hover:only-child,
1658+.linked > .button:checked:hover:only-child,
1659+.linked > .button:focus:only-child,
1660+.linked > .button:focus:active:only-child,
1661+.linked > .button:focus:checked:only-child,
1662+.linked > .button:insensitive:only-child,
1663+.linked > .button:backdrop:only-child,
1664+.linked > .button:active:backdrop:only-child,
1665+.linked > .button:checked:backdrop:only-child,
1666+.linked > GtkComboBox:only-child > .button,
1667+.linked > GtkComboBox:only-child > .button:active,
1668+.linked > GtkComboBox:only-child > .button:checked,
1669+.linked > GtkComboBox:only-child > .button:active:hover,
1670+.linked > GtkComboBox:only-child > .button:checked:hover,
1671+.linked > GtkComboBox:only-child > .button:focus,
1672+.linked > GtkComboBox:only-child > .button:focus:active,
1673+.linked > GtkComboBox:only-child > .button:focus:checked,
1674+.linked > GtkComboBox:only-child > .button:insensitive,
1675+.linked > GtkComboBox:only-child > .button:backdrop,
1676+.linked > GtkComboBox:only-child > .button:active:backdrop,
1677+.linked > GtkComboBox:only-child > .button:checked:backdrop {
1678+ border-right-width: 1px;
1679+ border-left-width: 1px;
1680+ border-image-width: 10px 12px 10px 12px;
1681+ border-radius: 8px;
1682+}
1683+
1684+/* Middle button (vertical) */
1685+.linked.vertical .entry,
1686+.linked.vertical .button,
1687+.linked.vertical .button:active,
1688+.linked.vertical .button:active:hover,
1689+.linked.vertical .button:insensitive {
1690+ border-right-width: 0;
1691+ border-left-width: 0;
1692+ border-image-width: 0px 12px 0px 12px;
1693+ border-radius: 0;
1694+}
1695+
1696+/* Top button (vertical) */
1697+.linked.vertical .entry:first-child,
1698+.linked.vertical .button:first-child,
1699+.linked.vertical .button:active:first-child,
1700+.linked.vertical .button:active:hover:first-child,
1701+.linked.vertical .button:insensitive:first-child {
1702+ border-width: 1px;
1703+ border-bottom-width: 0;
1704+ border-image-width: 10px 12px 0px 12px;
1705+ border-radius: 8px;
1706+ border-bottom-left-radius: 0;
1707+ border-bottom-right-radius: 0;
1708+}
1709+
1710+/* Bottom button (vertical) */
1711+.linked.vertical .entry:last-child,
1712+.linked.vertical .button:last-child,
1713+.linked.vertical .button:active:last-child,
1714+.linked.vertical .button:active:hover:last-child,
1715+.linked.vertical .button:insensitive:last-child {
1716+ border-width: 1px;
1717+ border-bottom-width: 0;
1718+ border-image-width: 0px 12px 10px 12px;
1719+ border-radius: 8px;
1720+ border-top-left-radius: 0;
1721+ border-top-right-radius: 0;
1722+}
1723+
1724+/* Linked single button (vertical) */
1725+.linked.vertical .entry:only-child,
1726+.linked.vertical .button:only-child,
1727+.linked.vertical .button:active:only-child,
1728+.linked.vertical .button:active:hover:only-child,
1729+.linked.vertical .button:insensitive:only-child {
1730 border-right-width: 1px;
1731 border-left-width: 1px;
1732 border-image-width: 10px 12px 10px 12px;
1733@@ -381,7 +564,10 @@
1734 .menubar.toolbar .raised.linked .button,
1735 .header-bar .linked .button,
1736 .header-bar .button.raised.linked,
1737-.header-bar .raised.linked .button {
1738+.header-bar .raised.linked .button,
1739+.titlebar .linked .button,
1740+.titlebar .button.raised.linked,
1741+.titlebar .raised.linked .button {
1742 box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4),
1743 inset -1px 0 shade (@dark_bg_color, 0.9);
1744 }
1745@@ -394,7 +580,10 @@
1746 .menubar.toolbar .raised.linked .button:first-child,
1747 .header-bar .linked .button:first-child,
1748 .header-bar .button.raised.linked:first-child,
1749-.header-bar .raised.linked .button:first-child {
1750+.header-bar .raised.linked .button:first-child,
1751+.titlebar .linked .button:first-child,
1752+.titlebar .button.raised.linked:first-child,
1753+.titlebar .raised.linked .button:first-child {
1754 box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9);
1755 }
1756
1757@@ -404,21 +593,39 @@
1758 .menubar.toolbar .linked .button:last-child,
1759 .menubar.toolbar .button.raised.linked:last-child,
1760 .menubar.toolbar .raised.linked .button:last-child,
1761-.header-bar .linked .button:last-child,s
1762+.header-bar .linked .button:last-child,
1763 .header-bar .button.raised.linked:last-child,
1764-.header-bar .raised.linked .button:last-child {
1765+.header-bar .raised.linked .button:last-child,
1766+.titlebar .linked .button:last-child,
1767+.titlebar .button.raised.linked:last-child,
1768+.titlebar .raised.linked .button:last-child {
1769 box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4)
1770 }
1771
1772 .primary-toolbar .linked .button:active,
1773+.primary-toolbar .linked .button:checked,
1774 .primary-toolbar .button.raised.linked:active,
1775+.primary-toolbar .button.raised.linked:checked,
1776 .primary-toolbar .raised.linked .button:active,
1777+.primary-toolbar .raised.linked .button:checked,
1778 .menubar.toolbar .linked .button:active,
1779-.menubar.toolbar .button.raised.linked:active
1780+.menubar.toolbar .linked .button:checked,
1781+.menubar.toolbar .button.raised.linked:active,
1782+.menubar.toolbar .button.raised.linked:checked
1783 .menubar.toolbar .raised.linked .button:active,
1784+.menubar.toolbar .raised.linked .button:checked,
1785 .header-bar .linked .button:active,
1786+.header-bar .linked .button:checked,
1787 .header-bar .button.raised.linked:active,
1788-.header-bar .raised.linked .button:active {
1789+.header-bar .button.raised.linked:checked,
1790+.header-bar .raised.linked .button:active,
1791+.header-bar .raised.linked .button:checked,
1792+.titlebar .linked .button:active,
1793+.titlebar .linked .button:checked,
1794+.titlebar .button.raised.linked:active,
1795+.titlebar .button.raised.linked:checked,
1796+.titlebar .raised.linked .button:active,
1797+.titlebar .raised.linked .button:checked {
1798 box-shadow: inset 1px 0 shade (@dark_bg_color, 0.9);
1799 }
1800
1801@@ -430,7 +637,10 @@
1802 .menubar.toolbar .raised.linked .button:insensitive,
1803 .header-bar .linked .button:insensitive,
1804 .header-bar .button.raised.linked:insensitive,
1805-.header-bar .raised.linked .button:insensitive {
1806+.header-bar .raised.linked .button:insensitive,
1807+.titlebar .linked .button:insensitive,
1808+.titlebar .button.raised.linked:insensitive,
1809+.titlebar .raised.linked .button:insensitive {
1810 box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9);
1811 }
1812
1813@@ -442,7 +652,10 @@
1814 .menubar.toolbar .raised.linked .button:backdrop:last-child,
1815 .header-bar .linked .button:backdrop:last-child,
1816 .header-bar .button.raised.linked:backdrop:last-child,
1817-.header-bar .raised.linked .button:backdrop:last-child {
1818+.header-bar .raised.linked .button:backdrop:last-child,
1819+.titlebar .linked .button:backdrop:last-child,
1820+.titlebar .button.raised.linked:backdrop:last-child,
1821+.titlebar .raised.linked .button:backdrop:last-child {
1822 box-shadow: inset 1px 0 shade (@dark_bg_color, 1.2);
1823 }
1824
1825@@ -453,8 +666,11 @@
1826 .menubar.toolbar .button.raised.linked:insensitive:backdrop,
1827 .menubar.toolbar .raised.linked .button:insensitive:backdrop,
1828 .header-bar .linked .button:insensitive:backdrop,
1829+.titlebar .linked .button:insensitive:backdrop,
1830 .header-bar .button.raised.linked:insensitive:backdrop,
1831+.titlebar .button.raised.linked:insensitive:backdrop,
1832 .header-bar .raised.linked .button:insensitive:backdrop {
1833+.titlebar .raised.linked .button:insensitive:backdrop {
1834 box-shadow: inset -1px 0 @unfocused_insensitive_borders;
1835 }*/
1836
1837@@ -463,18 +679,31 @@
1838 .primary-toolbar .linked .entry:only-child,
1839 .primary-toolbar .linked .button:only-child,
1840 .primary-toolbar .linked .button:active:only-child,
1841+.primary-toolbar .linked .button:checked:only-child,
1842 .primary-toolbar .linked .button:active:hover:only-child,
1843+.primary-toolbar .linked .button:checked:hover:only-child,
1844 .primary-toolbar .linked .button:insensitive:only-child,
1845 .menubar.toolbar .linked .entry:only-child,
1846 .menubar.toolbar .linked .button:only-child,
1847 .menubar.toolbar .linked .button:active:only-child,
1848+.menubar.toolbar .linked .button:checked:only-child,
1849 .menubar.toolbar .linked .button:active:hover:only-child,
1850+.menubar.toolbar .linked .button:checked:hover:only-child,
1851 .menubar.toolbar .linked .button:insensitive:only-child,
1852 .header-bar .linked .entry:only-child,
1853 .header-bar .linked .button:only-child,
1854 .header-bar .linked .button:active:only-child,
1855+.header-bar .linked .button:checked:only-child,
1856 .header-bar .linked .button:active:hover:only-child,
1857-.header-bar .linked .button:insensitive:only-child {
1858+.header-bar .linked .button:checked:hover:only-child,
1859+.header-bar .linked .button:insensitive:only-child,
1860+.titlebar .linked .entry:only-child,
1861+.titlebar .linked .button:only-child,
1862+.titlebar .linked .button:active:only-child,
1863+.titlebar .linked .button:checked:only-child,
1864+.titlebar .linked .button:active:hover:only-child,
1865+.titlebar .linked .button:checked:hover:only-child,
1866+.titlebar .linked .button:insensitive:only-child {
1867 border-radius: 8px;
1868 box-shadow: none;
1869 }
1870@@ -526,6 +755,7 @@
1871
1872 GtkCheckButton:hover,
1873 GtkCheckButton:active:hover,
1874+GtkCheckButton:checked:hover,
1875 GtkCheckButton:selected,
1876 GtkCheckButton:selected:focus {
1877 background-color: transparent;
1878@@ -539,7 +769,8 @@
1879 * column-header *
1880 *****************/
1881 column-header .button,
1882-column-header .button:active {
1883+column-header .button:active,
1884+column-header .button:checked {
1885 border-radius: 0;
1886 border-width: 0 1px 1px 0;
1887 border-image: none;
1888@@ -605,8 +836,10 @@
1889
1890 .view:selected,
1891 .view:active,
1892+.view:checked,
1893 .content-view.view:selected,
1894-.content-view.view:active {
1895+.content-view.view:active,
1896+.content-view.view:checked {
1897 background-color: @selected_bg_color;
1898 }
1899
1900@@ -631,13 +864,15 @@
1901 background-color: transparent;
1902 }
1903
1904-GtkIconView.content-view.check:active {
1905+GtkIconView.content-view.check:active,
1906+GtkIconView.content-view.check:checked {
1907 /*background-image: url("assets/grid-selection-checked.svg");*/
1908 background-color: transparent;
1909 }
1910
1911 .content-view.view.check,
1912-.content-view.view.check:active {
1913+.content-view.view.check:active,
1914+.content-view.view.check:checked {
1915 background-color: transparent;
1916 }
1917
1918@@ -664,6 +899,7 @@
1919 .primary-toolbar GtkComboBox.combobox-entry .button,
1920 .menubar.toolbar GtkComboBox.combobox-entry .button,
1921 .header-bar GtkComboBox.combobox-entry .button,
1922+.titlebar GtkComboBox.combobox-entry .button,
1923 .entry {
1924 -GtkWidget-focus-line-width: 0;
1925
1926@@ -679,6 +915,7 @@
1927 .primary-toolbar GtkComboBox.combobox-entry .button:backdrop,
1928 .menubar.toolbar GtkComboBox.combobox-entry .button:backdrop,
1929 .header-bar GtkComboBox.combobox-entry .button:backdrop,
1930+.titlebar GtkComboBox.combobox-entry .button:backdrop,
1931 .entry:backdrop {
1932 background-image: -gtk-gradient (linear, left top, left bottom,
1933 from (mix (shade (@base_color, 0.96), @bg_color, 0.5)),
1934@@ -695,6 +932,7 @@
1935 .primary-toolbar GtkComboBox.combobox-entry .button:insensitive,
1936 .menubar.toolbar GtkComboBox.combobox-entry .button:insensitive,
1937 .header-bar GtkComboBox.combobox-entry .button:insensitive,
1938+.titlebar GtkComboBox.combobox-entry .button:insensitive,
1939 .entry:insensitive {
1940 background-color: #f5f5f5;
1941 background-image: none;
1942@@ -711,6 +949,7 @@
1943 .primary-toolbar GtkComboBox.combobox-entry .button:insensitive:backdrop,
1944 .menubar.toolbar GtkComboBox.combobox-entry .button:insensitive:backdrop,
1945 .header-bar GtkComboBox.combobox-entry .button:insensitive:backdrop,
1946+.titlebar GtkComboBox.combobox-entry .button:insensitive:backdrop,
1947 .entry:insensitive:backdrop {
1948 background-color: mix (#f5f5f5, @bg_color, 0.5);
1949
1950@@ -718,11 +957,9 @@
1951 }
1952
1953 .primary-toolbar .entry.progressbar,
1954-.primary-toolbar .entry.progressbar,
1955-.menubar.toolbar .entry.progressbar,
1956-.menubar.toolbar .entry.progressbar,
1957-.header-bar .entry.progressbar,
1958-.header-bar .entry.progressbar,
1959+.menubar.toolbar .entry.progressbar,
1960+.header-bar .entry.progressbar,
1961+.titlebar .entry.progressbar,
1962 .entry.progressbar {
1963 background-image: -gtk-gradient (linear, left top, left bottom,
1964 from (shade (@selected_bg_color, 0.8)),
1965@@ -743,13 +980,17 @@
1966 /*********
1967 * frame *
1968 *********/
1969-.frame {
1970- border-radius: 3px;
1971- border-width: 1px;
1972- border-style: solid;
1973- border-color: shade (@bg_color, 0.82);
1974- border-image: none;
1975- background: none;
1976+
1977+.window-frame {
1978+ border-radius: 10px 10px 0 0;
1979+ box-shadow: 2px 10px 30px @window_shadow;
1980+
1981+ /* this is used for the resize cursor area */
1982+ margin: 10px;
1983+}
1984+
1985+.window-frame:backdrop {
1986+ box-shadow: 2px 10px 25px @window_shadow_inactive;
1987 }
1988
1989 /************
1990@@ -892,10 +1133,12 @@
1991 .toolbar .primary-toolbar .menu,
1992 .toolbar .menubar.toolbar .menu,
1993 .toolbar .header-bar .menu,
1994+.toolbar .titlebar .menu,
1995 GtkMenuToolButton.menu,
1996 .primary-toolbar .button .menu,
1997 .menubar.toolbar .button .menu,
1998 .header-bar .button .menu,
1999+.titlebar .button .menu,
2000 .menu {
2001 background-image: none;
2002 background-color: shade (@dark_bg_color, 1.08);
2003@@ -941,24 +1184,39 @@
2004
2005 .menu.button:hover,
2006 .menu.button:active,
2007+.menu.button:checked,
2008 .menu.button:active:insensitive,
2009+.menu.button:checked:insensitive,
2010 .menu.button:insensitive,
2011 .menu.button
2012 /*.primary-toolbar .menu.button:hover,
2013 .primary-toolbar .menu.button:active,
2014+.primary-toolbar .menu.button:checked,
2015 .primary-toolbar .menu.button:active:insensitive,
2016+.primary-toolbar .menu.button:checked:insensitive,
2017 .primary-toolbar .menu.button:insensitive,
2018 .primary-toolbar .menu.button,
2019 .menubar.toolbar .menu.button:hover,
2020 .menubar.toolbar .menu.button:active,
2021+.menubar.toolbar .menu.button:checked,
2022 .menubar.toolbar .menu.button:active:insensitive,
2023+.menubar.toolbar .menu.button:checked:insensitive,
2024 .menubar.toolbar .menu.button:insensitive,
2025 .menubar.toolbar .menu.button,
2026 .header-bar .menu.button:hover,
2027+.titlebar .menu.button:hover,
2028 .header-bar .menu.button:active,
2029+.header-bar .menu.button:checked,
2030+.titlebar .menu.button:active,
2031+.titlebar .menu.button:checked,
2032 .header-bar .menu.button:active:insensitive,
2033+.header-bar .menu.button:checked:insensitive,
2034+.titlebar .menu.button:active:insensitive,
2035+.titlebar .menu.button:checked:insensitive,
2036 .header-bar .menu.button:insensitive,
2037-.header-bar .menu.button */
2038+.titlebar .menu.button:insensitive,
2039+.header-bar .menu.button
2040+.titlebar .menu.button */
2041 {
2042 background-color: shade (@dark_bg_color, 1.08);
2043 background-image: none;
2044@@ -1021,6 +1279,7 @@
2045 padding: 3px 5px 3px 5px;
2046
2047 text-shadow: none;
2048+ transition: none;
2049 }
2050
2051 .menuitem {
2052@@ -1037,6 +1296,7 @@
2053 }
2054
2055 .popover .menuitem:active:hover,
2056+.popover .menuitem:checked:hover,
2057 .menuitem:hover,
2058 .menu .menuitem:hover {
2059 border-radius: 0;
2060@@ -1054,10 +1314,13 @@
2061
2062 color: @selected_fg_color;
2063 text-shadow: 0 -1px shade (@selected_bg_color, 0.7);
2064+ transition: none;
2065 }
2066
2067 .menuitem.check:active,
2068-.menuitem.radio:active {
2069+.menuitem.check:checked,
2070+.menuitem.radio:active,
2071+.menuitem.radio:checked {
2072 color: @fg_color;
2073 }
2074
2075@@ -1079,7 +1342,9 @@
2076 .toolbar .menubar.toolbar .menu .menuitem:insensitive,
2077 .toolbar .menubar.toolbar .menu .menuitem *:insensitive,
2078 .toolbar .header-bar .menu .menuitem:insensitive,
2079+.toolbar .titlebar .menu .menuitem:insensitive,
2080 .toolbar .header-bar .menu .menuitem *:insensitive,
2081+.toolbar .titlebar .menu .menuitem *:insensitive,
2082 GtkMenuToolButton.menu .menuitem:insensitive,
2083 GtkMenuToolButton.menu .menuitem *:insensitive,
2084 .primary-toolbar .button .menu .menuitem:insensitive,
2085@@ -1088,6 +1353,8 @@
2086 .menubar.toolbar .button .menu .menuitem *:insensitive,
2087 .header-bar .button .menu .menuitem:insensitive,
2088 .header-bar .button .menu .menuitem *:insensitive,
2089+.titlebar .button .menu .menuitem:insensitive,
2090+.titlebar .button .menu .menuitem *:insensitive,
2091 .menuitem:insensitive,
2092 .menuitem *:insensitive {
2093 color: mix (@dark_fg_color, @dark_bg_color, 0.5);
2094@@ -1141,8 +1408,10 @@
2095 .primary-toolbar GtkScale.trough:backdrop,
2096 .menubar.toolbar GtkScale.trough,
2097 .menubar.toolbar GtkScale.trough:backdrop,
2098+.titlebar GtkScale.trough,
2099+.titlebar GtkScale.trough:backdrop,
2100+.header-bar GtkScale.trough:backdrop,
2101 .header-bar GtkScale.trough,
2102-.header-bar GtkScale.trough:backdrop,
2103 .menuitem GtkScale.trough {
2104 background-color: @dark_bg_color;
2105 background-image: none;
2106@@ -1172,17 +1441,38 @@
2107 /************
2108 * notebook *
2109 ************/
2110-.notebook tab.top { padding: 4px 6px 2px 6px; }
2111-.notebook tab.top:active { padding-bottom: 3px; }
2112-.notebook tab.bottom { padding: 2px 6px 4px 6px; }
2113-.notebook tab.bottom:active { padding-top: 3px; }
2114-.notebook tab.left { padding: 2px 4px 2px 6px; }
2115-.notebook tab.left:active { padding-right: 5px; }
2116-.notebook tab.right { padding: 2px 6px 2px 4px; }
2117-.notebook tab.right:active { padding-left: 5px; }
2118+.notebook tab.top {
2119+ padding: 4px 6px 2px 6px;
2120+}
2121+.notebook tab.top:active,
2122+.notebook tab.top:checked {
2123+ padding-bottom: 3px;
2124+}
2125+.notebook tab.bottom {
2126+ padding: 2px 6px 4px 6px;
2127+}
2128+.notebook tab.bottom:active,
2129+.notebook tab.bottom:checked {
2130+ padding-top: 3px;
2131+}
2132+.notebook tab.left {
2133+ padding: 2px 4px 2px 6px;
2134+}
2135+.notebook tab.left:active,
2136+.notebook tab.left:checked {
2137+ padding-right: 5px;
2138+}
2139+.notebook tab.right {
2140+ padding: 2px 6px 2px 4px;
2141+}
2142+.notebook tab.right:active,
2143+.notebook tab.right:checked {
2144+ padding-left: 5px;
2145+}
2146
2147 /* give active tab a background, as it might be dragged across of others when reordering */
2148-.notebook tab:active {
2149+.notebook tab:active,
2150+.notebook tab:checked {
2151 background-color: @bg_color;
2152 }
2153
2154@@ -1527,7 +1817,9 @@
2155 }
2156
2157 OsThumb:active,
2158-GtkScrollbar:active {
2159+OsThumb:checked,
2160+GtkScrollbar:active,
2161+GtkScrollbar:checked {
2162 background-color: shade (@bg_color, 0.6);
2163 }
2164
2165@@ -1610,10 +1902,12 @@
2166 .toolbar .primary-toolbar .menuitem.separator,
2167 .toolbar .menubar.toolbar .menuitem.separator,
2168 .toolbar .header-bar .menuitem.separator,
2169+.toolbar .titlebar .menuitem.separator,
2170 GtkMenuToolButton .menuitem.separator,
2171 .primary-toolbar .button .menuitem.separator,
2172 .menubar.toolbar .button .menuitem.separator,
2173 .header-bar .button .menuitem.separator,
2174+.titlebar .button .menuitem.separator,
2175 .menuitem.separator {
2176 border-color: shade (@dark_bg_color, 0.99);
2177 border-bottom-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
2178@@ -1642,15 +1936,18 @@
2179 * spinbutton *
2180 **************/
2181 .spinbutton.button:active,
2182+.spinbutton.button:checked,
2183 .spinbutton.button:insensitive,
2184 .spinbutton.button {
2185 border-radius: 0;
2186 }
2187
2188 .spinbutton.button:active:nth-child(last),
2189+.spinbutton.button:checked:nth-child(last),
2190 .spinbutton.button:insensitive:nth-child(last)
2191 .spinbutton.button:nth-child(last),
2192 .spinbutton.button:active:backdrop:nth-child(last),
2193+.spinbutton.button:checked:backdrop:nth-child(last),
2194 .spinbutton.button:insensitive:backdrop:nth-child(last),
2195 .spinbutton.button:backdrop:nth-child(last) {
2196 border-radius: 0 7px 7px 0;
2197@@ -1658,8 +1955,10 @@
2198
2199 .spinbutton.button,
2200 .spinbutton.button:active,
2201+.spinbutton.button:checked,
2202 .spinbutton.button:backdrop,
2203 .spinbutton.button:active:backdrop,
2204+.spinbutton.button:checked:backdrop,
2205 .spinbutton.button:hover,
2206 .spinbutton.button:hover:backdrop {
2207 background-image: none;
2208@@ -1669,7 +1968,8 @@
2209 border-left-color: alpha (shade (@bg_color, 0.6), 0.22);
2210 }
2211
2212-.spinbutton.button:active {
2213+.spinbutton.button:active,
2214+.spinbutton.button:checked {
2215 background-image: -gtk-gradient (radial, center center, 0.0, center center, 0.5,
2216 from (alpha (@selected_bg_color, 0.2)),
2217 to (alpha (@selected_bg_color, 0.0)));
2218@@ -1690,119 +1990,25 @@
2219 /***********
2220 * spinner *
2221 ***********/
2222-@keyframes spinner {
2223- 0.00% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
2224- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
2225- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
2226- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
2227- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
2228- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
2229- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
2230- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); }
2231-
2232- 12.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
2233- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
2234- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
2235- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
2236- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
2237- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
2238- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
2239- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); }
2240-
2241- 25.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
2242- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
2243- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
2244- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
2245- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
2246- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
2247- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
2248- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)); }
2249-
2250- 37.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
2251- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
2252- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
2253- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
2254- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
2255- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
2256- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
2257- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)); }
2258-
2259- 50.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
2260- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
2261- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
2262- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
2263- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
2264- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
2265- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
2266- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)); }
2267-
2268- 62.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
2269- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
2270- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
2271- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
2272- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
2273- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
2274- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
2275- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)); }
2276-
2277- 75.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
2278- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
2279- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
2280- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
2281- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
2282- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
2283- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
2284- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)); }
2285-
2286- 87.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
2287- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
2288- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
2289- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
2290- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
2291- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
2292- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
2293- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)); }
2294-
2295- 100% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
2296- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
2297- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
2298- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
2299- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
2300- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
2301- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
2302- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); }
2303+@keyframes spin {
2304+ to {
2305+ -gtk-icon-transform: rotate(1turn);
2306+ }
2307 }
2308
2309 .spinner {
2310- background-color: transparent;
2311- background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
2312- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
2313- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
2314- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
2315- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
2316- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
2317- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
2318- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent));
2319- background-position: 14% 14%, 0% 50%, 14% 86%, 50% 100%, 86% 86%, 100% 50%, 86% 14%, 50% 0%;
2320- background-size: 20% 20%;
2321- background-repeat: no-repeat;
2322-}
2323-
2324-.menu .spinner,
2325-.menu .spinner:hover,
2326-.primary-toolbar .spinner,
2327-.primary-toolbar .spinner,
2328-.menubar.toolbar .spinner,
2329-.menubar.toolbar .spinner,
2330-.header-bar .spinner,
2331-.header-bar .spinner {
2332- color: @selected_bg_color;
2333- border: none;
2334- box-shadow: none;
2335+ background-image: none;
2336+ opacity: 0;
2337+ -gtk-icon-source: -gtk-icontheme("process-working-symbolic");
2338 }
2339
2340 .spinner:active {
2341- animation: spinner 1s infinite linear;
2342+ opacity: 1;
2343+ animation: spin 1s linear infinite;
2344+}
2345+
2346+.spinner:active:insensitive {
2347+ opacity: 0.5;
2348 }
2349
2350 /*************
2351@@ -1829,7 +2035,8 @@
2352 text-shadow: 0 1px alpha (shade (@bg_color, 1.25), 0.5);
2353 }
2354
2355-GtkSwitch.trough:active {
2356+GtkSwitch.trough:active,
2357+GtkSwitch.trough:checked {
2358 background-image: -gtk-gradient (linear, left top, left bottom,
2359 from (shade (@selected_bg_color, 0.93)),
2360 to (shade (@selected_bg_color, 0.99)));
2361@@ -1855,6 +2062,27 @@
2362 border-style: solid;
2363 }
2364
2365+/********************
2366+ * app-notification *
2367+ ********************/
2368+.app-notification {
2369+ color: @selected_fg_color;
2370+ padding: 10px;
2371+ background-image: linear-gradient(to bottom, alpha(black, 0.8),
2372+ transparent 2px);
2373+ background-color: alpha(black, 0.8)
2374+}
2375+
2376+.top .app-notification {
2377+ border-bottom-right-radius: 5px;
2378+ border-bottom-left-radius: 5px;
2379+}
2380+
2381+.bottom .app-notification {
2382+ border-top-right-radius: 5px;
2383+ border-top-left-radius: 5px;
2384+}
2385+
2386 /************
2387 * textview *
2388 ************/
2389@@ -1943,7 +2171,8 @@
2390 .primary-toolbar .toolbar,
2391 .primary-toolbar.toolbar,
2392 .menubar.toolbar,
2393-.header-bar {
2394+.header-bar,
2395+.titlebar {
2396 -GtkWidget-window-dragging: true;
2397
2398 background-image: -gtk-gradient (linear, left top, left bottom,
2399@@ -1952,8 +2181,7 @@
2400 border-bottom-color: shade (@dark_bg_color, 1.1);
2401 border-top-color: shade (@dark_bg_color, 1.09);
2402 border-style: solid;
2403- border-width: 1px 0 1px 0;
2404- border-radius: 0;
2405+ border-width: 0;
2406
2407 color: @dark_fg_color;
2408 text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
2409@@ -1965,7 +2193,8 @@
2410 .primary-toolbar.toolbar:backdrop,
2411 .menubar.toolbar .toolbar:backdrop,
2412 .menubar.toolbar.toolbar:backdrop,
2413-.header-bar:backdrop {
2414+.header-bar:backdrop,
2415+.titlebar:backdrop {
2416 background-image: none;
2417 background-color: @dark_bg_color;
2418 box-shadow: none;
2419@@ -1977,16 +2206,34 @@
2420
2421 .primary-toolbar :insensitive,
2422 .menubar.toolbar .toolbar :insensitive,
2423-.header-bar :insensitive {
2424+.header-bar :insensitive,
2425+.titlebar :insensitive {
2426 text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
2427 }
2428
2429+.header-bar,
2430+.titlebar {
2431+ padding: 2px 3px;
2432+}
2433+
2434+.header-bar .title,
2435+.titlebar .title {
2436+ font: Bold 10.5;
2437+}
2438+
2439+.header-bar .subtitle,
2440+.titlebar .subtitle {
2441+ font: 9;
2442+}
2443+
2444 .primary-toolbar GtkComboBox,
2445 .primary-toolbar .button,
2446 .menubar.toolbar GtkComboBox,
2447 .menubar.toolbar .button,
2448 .header-bar GtkComboBox,
2449-.header-bar .button {
2450+.header-bar .button,
2451+.titlebar GtkComboBox,
2452+.titlebar .button {
2453 background-color: transparent;
2454 background-image: none;
2455 border-color: transparent;
2456@@ -1996,6 +2243,7 @@
2457
2458 color: @dark_fg_color;
2459 text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
2460+ padding: 9px;
2461 }
2462
2463 .primary-toolbar GtkComboBox:backdrop,
2464@@ -2003,7 +2251,9 @@
2465 .menubar.toolbar GtkComboBox:backdrop,
2466 .menubar.toolbar .button:backdrop,
2467 .header-bar GtkComboBox:backdrop,
2468-.header-bar .button:backdrop {
2469+.header-bar .button:backdrop,
2470+.titlebar GtkComboBox:backdrop,
2471+.titlebar .button:backdrop {
2472 color: @backdrop_dark_fg_color;
2473 text-shadow: 0 -1px shade (@dark_bg_color, 0.9);
2474 }
2475@@ -2012,17 +2262,26 @@
2476 .primary-toolbar .raised.button,
2477 .primary-toolbar .button:hover,
2478 .primary-toolbar .button:active,
2479+.primary-toolbar .button:checked,
2480 .primary-toolbar .button:insensitive,
2481 .menubar.toolbar .raised .button,
2482 .menubar.toolbar .raised.button,
2483 .menubar.toolbar .button:hover,
2484 .menubar.toolbar .button:active,
2485+.menubar.toolbar .button:checked,
2486 .menubar.toolbar .button:insensitive,
2487 .header-bar .raised .button,
2488 .header-bar .raised.button,
2489 .header-bar .button:hover,
2490 .header-bar .button:active,
2491-.header-bar .button:insensitive {
2492+.header-bar .button:checked,
2493+.header-bar .button:insensitive,
2494+.titlebar .raised .button,
2495+.titlebar .raised.button,
2496+.titlebar .button:hover,
2497+.titlebar .button:active,
2498+.titlebar .button:checked,
2499+.titlebar .button:insensitive {
2500 background-image: -gtk-gradient (linear, left top, left bottom,
2501 from (shade (@dark_bg_color, 1.2)),
2502 to (shade (@dark_bg_color, 1.1)));
2503@@ -2030,8 +2289,13 @@
2504 }
2505
2506 .primary-toolbar .button:active,
2507+.primary-toolbar .button:checked,
2508 .menubar.toolbar .button:active,
2509-.header-bar .button:active {
2510+.menubar.toolbar .button:checked,
2511+.header-bar .button:active,
2512+.header-bar .button:checked,
2513+.titlebar .button:active,
2514+.titlebar .button:checked {
2515 background-image: -gtk-gradient (linear, left top, left bottom,
2516 from (shade (@dark_bg_color, 0.9)),
2517 to (shade (@dark_bg_color, 0.95)));
2518@@ -2040,33 +2304,50 @@
2519 }
2520
2521 .primary-toolbar .button:active:hover,
2522+.primary-toolbar .button:checked:hover,
2523 .menubar.toolbar .button:active:hover,
2524-.header-bar .button:active:hover {
2525+.menubar.toolbar .button:checked:hover,
2526+.header-bar .button:active:hover,
2527+.header-bar .button:checked:hover,
2528+.titlebar .button:active:hover,
2529+.titlebar .button:checked:hover {
2530 background-image: -gtk-gradient (linear, left top, left bottom,
2531 from (shade (@dark_bg_color, 0.95)),
2532 to (shade (@dark_bg_color, 1.0)));
2533 }
2534
2535 .primary-toolbar .button:active:insensitive,
2536+.primary-toolbar .button:checked:insensitive,
2537 .primary-toolbar .button:insensitive,
2538 .menubar.toolbar .button:active:insensitive,
2539+.menubar.toolbar .button:checked:insensitive,
2540 .menubar.toolbar .button:insensitive,
2541 .header-bar .button:active:insensitive,
2542-.header-bar .button:insensitive {
2543+.header-bar .button:checked:insensitive,
2544+.header-bar .button:insensitive,
2545+.titlebar .button:active:insensitive,
2546+.titlebar .button:checked:insensitive,
2547+.titlebar .button:insensitive {
2548 text-shadow: none;
2549 }
2550
2551 .primary-toolbar .button:insensitive,
2552 .menubar.toolbar .button:insensitive,
2553-.header-bar .button:insensitive {
2554+.header-bar .button:insensitive,
2555+.titlebar .button:insensitive {
2556 background-image: -gtk-gradient (linear, left top, left bottom,
2557 from (shade (@dark_bg_color, 1.01)),
2558 to (shade (@dark_bg_color, 0.99)));
2559 }
2560
2561 .primary-toolbar .button:active:insensitive,
2562+.primary-toolbar .button:checked:insensitive,
2563 .menubar.toolbar .button:active:insensitive,
2564-.header-bar .button:active:insensitive {
2565+.menubar.toolbar .button:checked:insensitive,
2566+.header-bar .button:active:insensitive,
2567+.header-bar .button:checked:insensitive,
2568+.titlebar .button:active:insensitive,
2569+.titlebar .button:checked:insensitive {
2570 background-image: -gtk-gradient (linear, left top, left bottom,
2571 from (shade (@dark_bg_color, 0.94)),
2572 to (shade (@dark_bg_color, 1.02)));
2573@@ -2080,7 +2361,10 @@
2574 .menubar.toolbar .separator:insensitive,
2575 .header-bar GtkSeparatorToolItem,
2576 .header-bar .separator,
2577-.header-bar .separator:insensitive {
2578+.header-bar .separator:insensitive,
2579+.titlebar GtkSeparatorToolItem,
2580+.titlebar .separator,
2581+.titlebar .separator:insensitive {
2582 border-color: alpha (shade (@dark_bg_color, 0.94), 0.35);
2583 border-bottom-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
2584 border-right-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
2585@@ -2115,15 +2399,19 @@
2586 /* Middle button */
2587 .inline-toolbar.toolbar .button,
2588 .inline-toolbar.toolbar .button:active,
2589+.inline-toolbar.toolbar .button:checked,
2590 .inline-toolbar.toolbar .button:focus,
2591 .inline-toolbar.toolbar .button:focus:active,
2592+.inline-toolbar.toolbar .button:focus:checked,
2593 .inline-toolbar.toolbar .button:insensitive,
2594 .inline-toolbar.toolbar .button:backdrop,
2595 .inline-toolbar.toolbar .button:backdrop:insensitive,
2596 .inline-toolbar.toolbar GtkToolButton .button,
2597 .inline-toolbar.toolbar GtkToolButton .button:active,
2598+.inline-toolbar.toolbar GtkToolButton .button:checked,
2599 .inline-toolbar.toolbar GtkToolButton .button:focus,
2600 .inline-toolbar.toolbar GtkToolButton .button:focus:active,
2601+.inline-toolbar.toolbar GtkToolButton .button:focus:checked,
2602 .inline-toolbar.toolbar GtkToolButton .button:insensitive,
2603 .inline-toolbar.toolbar GtkToolButton .button:backdrop,
2604 .inline-toolbar.toolbar GtkToolButton .button:backdrop:insensitive {
2605@@ -2136,15 +2424,19 @@
2606 /* Leftmost button */
2607 .inline-toolbar.toolbar .button:first-child,
2608 .inline-toolbar.toolbar .button:active:first-child,
2609+.inline-toolbar.toolbar .button:checked:first-child,
2610 .inline-toolbar.toolbar .button:focus:first-child,
2611 .inline-toolbar.toolbar .button:focus:active:first-child,
2612+.inline-toolbar.toolbar .button:focus:checked:first-child,
2613 .inline-toolbar.toolbar .button:insensitive:first-child,
2614 .inline-toolbar.toolbar .button:backdrop:first-child,
2615 .inline-toolbar.toolbar .button:backdrop:insensitive:first-child,
2616 .inline-toolbar.toolbar GtkToolButton:first-child .button,
2617 .inline-toolbar.toolbar GtkToolButton:first-child .button:active,
2618+.inline-toolbar.toolbar GtkToolButton:first-child .button:checked,
2619 .inline-toolbar.toolbar GtkToolButton:first-child .button:focus,
2620 .inline-toolbar.toolbar GtkToolButton:first-child .button:focus:active,
2621+.inline-toolbar.toolbar GtkToolButton:first-child .button:focus:checked,
2622 .inline-toolbar.toolbar GtkToolButton:first-child .button:insensitive,
2623 .inline-toolbar.toolbar GtkToolButton:first-child .button:backdrop,
2624 .inline-toolbar.toolbar GtkToolButton:first-child .button:backdrop:insensitive {
2625@@ -2159,15 +2451,19 @@
2626 /* Rightmost button */
2627 .inline-toolbar.toolbar .button:last-child,
2628 .inline-toolbar.toolbar .button:active:last-child,
2629+.inline-toolbar.toolbar .button:checked:last-child,
2630 .inline-toolbar.toolbar .button:focus:last-child,
2631 .inline-toolbar.toolbar .button:focus:active:last-child,
2632+.inline-toolbar.toolbar .button:focus:checked:last-child,
2633 .inline-toolbar.toolbar .button:insensitive:last-child,
2634 .inline-toolbar.toolbar .button:backdrop:last-child,
2635 .inline-toolbar.toolbar .button:backdrop:insensitive:last-child,
2636 .inline-toolbar.toolbar GtkToolButton:last-child .button,
2637 .inline-toolbar.toolbar GtkToolButton:last-child .button:active,
2638+.inline-toolbar.toolbar GtkToolButton:last-child .button:checked,
2639 .inline-toolbar.toolbar GtkToolButton:last-child .button:focus,
2640 .inline-toolbar.toolbar GtkToolButton:last-child .button:focus:active,
2641+.inline-toolbar.toolbar GtkToolButton:last-child .button:focus:checked,
2642 .inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive,
2643 .inline-toolbar.toolbar GtkToolButton:last-child .button:backdrop,
2644 .inline-toolbar.toolbar GtkToolButton:last-child .button:backdrop:insensitive {
2645@@ -2183,15 +2479,19 @@
2646 /* Single button */
2647 .inline-toolbar.toolbar .button:only-child,
2648 .inline-toolbar.toolbar .button:active:only-child,
2649+.inline-toolbar.toolbar .button:checked:only-child,
2650 .inline-toolbar.toolbar .button:focus:only-child,
2651 .inline-toolbar.toolbar .button:focus:active:only-child,
2652+.inline-toolbar.toolbar .button:focus:checked:only-child,
2653 .inline-toolbar.toolbar .button:insensitive:only-child,
2654 .inline-toolbar.toolbar .button:backdrop:only-child,
2655 .inline-toolbar.toolbar .button:backdrop:insensitive:only-child,
2656 .inline-toolbar.toolbar GtkToolButton:only-child .button,
2657 .inline-toolbar.toolbar GtkToolButton:only-child .button:active,
2658+.inline-toolbar.toolbar GtkToolButton:only-child .button:checked,
2659 .inline-toolbar.toolbar GtkToolButton:only-child .button:focus,
2660 .inline-toolbar.toolbar GtkToolButton:only-child .button:focus:active,
2661+.inline-toolbar.toolbar GtkToolButton:only-child .button:focus:checked,
2662 .inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive,
2663 .inline-toolbar.toolbar GtkToolButton:only-child .button:backdrop,
2664 .inline-toolbar.toolbar GtkToolButton:only-child .button:backdrop:insensitive {
2665@@ -2202,6 +2502,14 @@
2666 /*box-shadow: none;*/
2667 }
2668
2669+/***************
2670+ * Dialog *
2671+ ***************/
2672+.prompt,
2673+GtkMessageDialog {
2674+ -GtkDialog-button-spacing: 0;
2675+}
2676+
2677 /***********
2678 * tooltip *
2679 ***********/
2680@@ -2276,8 +2584,10 @@
2681 */
2682 .popover .menuitem,
2683 .popover .menuitem:active,
2684+.popover .menuitem:checked,
2685 .popover .menuitem:hover,
2686 .popover .menuitem:hover:active,
2687+.popover .menuitem:hover:checked,
2688 .popover .menuitem:insensitive,
2689 .popover .menuitem:backdrop {
2690 border-image: none;
2691@@ -2294,10 +2604,13 @@
2692 }
2693
2694 .popover .menuitem:active,
2695+.popover .menuitem:checked,
2696 .popover .menuitem.check,
2697 .popover .menuitem.check:active,
2698+.popover .menuitem.check:checked,
2699 .popover .menuitem.radio,
2700-.popover .menuitem.radio:active {
2701+.popover .menuitem.radio:active,
2702+.popover .menuitem.radio:checked {
2703 background-image: none;
2704 border: none;
2705 }
2706
2707=== modified file 'Ambiance/metacity-1/metacity-theme-1.xml'
2708--- Ambiance/metacity-1/metacity-theme-1.xml 2012-02-29 10:33:15 +0000
2709+++ Ambiance/metacity-1/metacity-theme-1.xml 2014-10-21 15:21:37 +0000
2710@@ -10,17 +10,17 @@
2711 </info>
2712
2713 <!-- general window layout -->
2714-<frame_geometry name="frame_geometry_normal" title_scale="medium" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="false" rounded_bottom_right="false">
2715- <distance name="left_width" value="1"/>
2716- <distance name="right_width" value="1"/>
2717- <distance name="bottom_height" value="1"/>
2718- <distance name="left_titlebar_edge" value="10"/>
2719- <distance name="right_titlebar_edge" value="10"/>
2720+<frame_geometry name="frame_geometry_normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4" rounded_bottom_left="0" rounded_bottom_right="0">
2721+ <distance name="left_width" value="0"/>
2722+ <distance name="right_width" value="0"/>
2723+ <distance name="bottom_height" value="0"/>
2724+ <distance name="left_titlebar_edge" value="7"/>
2725+ <distance name="right_titlebar_edge" value="7"/>
2726 <distance name="button_width" value="18"/>
2727 <distance name="button_height" value="20"/>
2728- <distance name="title_vertical_pad" value="11"/>
2729- <border name="title_border" left="2" right="2" top="0" bottom="0"/>
2730- <border name="button_border" left="0" right="0" top="1" bottom="0"/>
2731+ <distance name="title_vertical_pad" value="10"/>
2732+ <border name="title_border" left="0" right="2" top="0" bottom="0"/>
2733+ <border name="button_border" left="0" right="1" top="1" bottom="0"/>
2734 </frame_geometry>
2735
2736 <frame_geometry name="geometry_maximized" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false">
2737@@ -31,15 +31,15 @@
2738 <distance name="right_titlebar_edge" value="10"/>
2739 <distance name="button_width" value="18"/>
2740 <distance name="button_height" value="20"/>
2741- <distance name="title_vertical_pad" value="11"/>
2742- <border name="title_border" left="2" right="2" top="0" bottom="0"/>
2743- <border name="button_border" left="0" right="0" top="1" bottom="0"/>
2744+ <distance name="title_vertical_pad" value="10"/>
2745+ <border name="title_border" left="0" right="2" top="0" bottom="0"/>
2746+ <border name="button_border" left="0" right="1" top="1" bottom="0"/>
2747 </frame_geometry>
2748
2749 <frame_geometry name="border" has_title="false">
2750- <distance name="left_width" value="3"/>
2751- <distance name="right_width" value="3"/>
2752- <distance name="bottom_height" value="3"/>
2753+ <distance name="left_width" value="0"/>
2754+ <distance name="right_width" value="0"/>
2755+ <distance name="bottom_height" value="0"/>
2756 <distance name="left_titlebar_edge" value="0"/>
2757 <distance name="right_titlebar_edge" value="0"/>
2758 <distance name="button_width" value="0"/>
2759@@ -71,15 +71,11 @@
2760 <!-- frame and gradient -->
2761 <rectangle color="#3c3b37" filled="false" x="0" y="0" width="width-1" height="top_height"/>
2762 <gradient type="vertical" x="1" y="1" width="width-2" height="top_height-1">
2763- <color value="shade/#474642/1.1" />
2764- <color value="#3c3b37" />
2765+ <color value="shade/#3c3b37/1.5" />
2766+ <color value="shade/#3c3b37/1.0" />
2767 </gradient>
2768 <!-- top line -->
2769- <gradient type="horizontal" x="0" y="1" width="width" height="1">
2770- <color value="shade/#474642/1.2" />
2771- <color value="shade/#474642/1.5" />
2772- <color value="shade/#474642/1.2" />
2773- </gradient>
2774+ <line color="shade/#3c3b37/1.6" x1="0" x2="width" y1="1" y2="1"/>
2775 <!-- left arch -->
2776 <!-- <arc color="shade/#474642/1.1" x="0" y="1" width="9" height="7" start_angle="270" extent_angle="90" />
2777 <arc color="#3c3b37" x="0" y="0" width="9" height="9" start_angle="270" extent_angle="90" /> -->
2778@@ -190,82 +186,6 @@
2779
2780 <!-- buttons -->
2781
2782-<!-- button trough left -->
2783-<draw_ops name="left_left_background_focused_normal">
2784- <image filename="trough_left.png" x="0" y="1" width="object_width" height="object_height"/>
2785-</draw_ops>
2786-<draw_ops name="left_left_background_focused_pressed">
2787- <image filename="trough_left.png" x="0" y="1" width="object_width" height="object_height"/>
2788-</draw_ops>
2789-<draw_ops name="left_middle_background_focused_normal">
2790- <image filename="trough_middle.png" x="0" y="1" width="object_width" height="object_height"/>
2791-</draw_ops>
2792-<draw_ops name="left_middle_background_focused_pressed">
2793- <image filename="trough_middle.png" x="0" y="1" width="object_width" height="object_height"/>
2794-</draw_ops>
2795-<draw_ops name="left_right_background_focused_normal">
2796- <image filename="trough_right.png" x="0" y="1" width="object_width" height="object_height"/>
2797-</draw_ops>
2798-<draw_ops name="left_right_background_focused_pressed">
2799- <image filename="trough_right.png" x="0" y="1" width="object_width" height="object_height"/>
2800-</draw_ops>
2801-<draw_ops name="left_left_background_unfocused_normal">
2802- <image filename="trough_unfocused_left.png" x="0" y="1" width="object_width" height="object_height"/>
2803-</draw_ops>
2804-<draw_ops name="left_left_background_unfocused_pressed">
2805- <image filename="trough_unfocused_left.png" x="0" y="1" width="object_width" height="object_height"/>
2806-</draw_ops>
2807-<draw_ops name="left_middle_background_unfocused_normal">
2808- <image filename="trough_unfocused_middle.png" x="0" y="1" width="object_width" height="object_height"/>
2809-</draw_ops>
2810-<draw_ops name="left_middle_background_unfocused_pressed">
2811- <image filename="trough_unfocused_middle.png" x="0" y="1" width="object_width" height="object_height"/>
2812-</draw_ops>
2813-<draw_ops name="left_right_background_unfocused_normal">
2814- <image filename="trough_unfocused_right.png" x="0" y="1" width="object_width" height="object_height"/>
2815-</draw_ops>
2816-<draw_ops name="left_right_background_unfocused_pressed">
2817- <image filename="trough_unfocused_right.png" x="0" y="1" width="object_width" height="object_height"/>
2818-</draw_ops>
2819-
2820-<!-- button trough right -->
2821-<draw_ops name="right_left_background_focused_normal">
2822- <image filename="trough_left.png" x="0" y="1" width="object_width" height="object_height"/>
2823-</draw_ops>
2824-<draw_ops name="right_left_background_focused_pressed">
2825- <image filename="trough_left.png" x="0" y="1" width="object_width" height="object_height"/>
2826-</draw_ops>
2827-<draw_ops name="right_middle_background_focused_normal">
2828- <image filename="trough_middle.png" x="0" y="1" width="object_width" height="object_height"/>
2829-</draw_ops>
2830-<draw_ops name="right_middle_background_focused_pressed">
2831- <image filename="trough_middle.png" x="0" y="1" width="object_width" height="object_height"/>
2832-</draw_ops>
2833-<draw_ops name="right_right_background_focused_normal">
2834- <image filename="trough_right.png" x="0" y="1" width="object_width" height="object_height"/>
2835-</draw_ops>
2836-<draw_ops name="right_right_background_focused_pressed">
2837- <image filename="trough_right.png" x="0" y="1" width="object_width" height="object_height"/>
2838-</draw_ops>
2839-<draw_ops name="right_left_background_unfocused_normal">
2840- <image filename="trough_unfocused_left.png" x="0" y="1" width="object_width" height="object_height"/>
2841-</draw_ops>
2842-<draw_ops name="right_left_background_unfocused_pressed">
2843- <image filename="trough_unfocused_left.png" x="0" y="1" width="object_width" height="object_height"/>
2844-</draw_ops>
2845-<draw_ops name="right_middle_background_unfocused_normal">
2846- <image filename="trough_unfocused_middle.png" x="0" y="1" width="object_width" height="object_height"/>
2847-</draw_ops>
2848-<draw_ops name="right_middle_background_unfocused_pressed">
2849- <image filename="trough_unfocused_middle.png" x="0" y="1" width="object_width" height="object_height"/>
2850-</draw_ops>
2851-<draw_ops name="right_right_background_unfocused_normal">
2852- <image filename="trough_unfocused_right.png" x="0" y="1" width="object_width" height="object_height"/>
2853-</draw_ops>
2854-<draw_ops name="right_right_background_unfocused_pressed">
2855- <image filename="trough_unfocused_right.png" x="0" y="1" width="object_width" height="object_height"/>
2856-</draw_ops>
2857-
2858 <!-- button prelightlays -->
2859 <draw_ops name="menu_focused_normal">
2860 <image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
2861@@ -359,27 +279,9 @@
2862 <piece position="left_edge" draw_ops="draw_frame"/>
2863 <piece position="right_edge" draw_ops="draw_frame"/>
2864 <piece position="bottom_edge" draw_ops="bottom_edge"/>
2865- <button function="left_left_background" state="normal" draw_ops="left_left_background_focused_normal"/>
2866- <button function="left_middle_background" state="normal" draw_ops="left_middle_background_focused_normal"/>
2867- <button function="left_right_background" state="normal" draw_ops="left_right_background_focused_normal"/>
2868- <button function="left_left_background" state="prelight" draw_ops="left_left_background_focused_normal"/>
2869- <button function="left_middle_background" state="prelight" draw_ops="left_middle_background_focused_normal"/>
2870- <button function="left_right_background" state="prelight" draw_ops="left_right_background_focused_normal"/>
2871- <button function="left_left_background" state="pressed" draw_ops="left_left_background_focused_pressed"/>
2872- <button function="left_middle_background" state="pressed" draw_ops="left_middle_background_focused_pressed"/>
2873- <button function="left_right_background" state="pressed" draw_ops="left_right_background_focused_pressed"/>
2874- <button function="right_left_background" state="normal" draw_ops="right_left_background_focused_normal"/>
2875- <button function="right_middle_background" state="normal" draw_ops="right_middle_background_focused_normal"/>
2876- <button function="right_right_background" state="normal" draw_ops="right_right_background_focused_normal"/>
2877- <button function="right_left_background" state="prelight" draw_ops="right_left_background_focused_normal"/>
2878- <button function="right_middle_background" state="prelight" draw_ops="right_middle_background_focused_normal"/>
2879- <button function="right_right_background" state="prelight" draw_ops="right_right_background_focused_normal"/>
2880- <button function="right_left_background" state="pressed" draw_ops="right_left_background_focused_pressed"/>
2881- <button function="right_middle_background" state="pressed" draw_ops="right_middle_background_focused_pressed"/>
2882- <button function="right_right_background" state="pressed" draw_ops="right_right_background_focused_pressed"/>
2883 <button function="menu" state="normal" draw_ops="menu_focused_normal"/>
2884 <button function="menu" state="prelight" draw_ops="menu_focused_prelight"/>
2885- <button function="menu" state="pressed" draw_ops="menu_focused_normal"/>
2886+ <button function="menu" state="pressed" draw_ops="menu_focused_normal"/>
2887 <button function="minimize" state="normal" draw_ops="minimize_focused_normal"/>
2888 <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight"/>
2889 <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed"/>
2890@@ -399,27 +301,9 @@
2891 <piece position="left_edge" draw_ops="draw_frame"/>
2892 <piece position="right_edge" draw_ops="draw_frame"/>
2893 <piece position="bottom_edge" draw_ops="bottom_edge"/>
2894- <button function="left_left_background" state="normal" draw_ops="left_left_background_unfocused_normal"/>
2895- <button function="left_middle_background" state="normal" draw_ops="left_middle_background_unfocused_normal"/>
2896- <button function="left_right_background" state="normal" draw_ops="left_right_background_unfocused_normal"/>
2897- <button function="left_left_background" state="prelight" draw_ops="left_left_background_unfocused_normal"/>
2898- <button function="left_middle_background" state="prelight" draw_ops="left_middle_background_unfocused_normal"/>
2899- <button function="left_right_background" state="prelight" draw_ops="left_right_background_unfocused_normal"/>
2900- <button function="left_left_background" state="pressed" draw_ops="left_left_background_unfocused_pressed"/>
2901- <button function="left_middle_background" state="pressed" draw_ops="left_middle_background_unfocused_pressed"/>
2902- <button function="left_right_background" state="pressed" draw_ops="left_right_background_unfocused_pressed"/>
2903- <button function="right_left_background" state="normal" draw_ops="right_left_background_unfocused_normal"/>
2904- <button function="right_middle_background" state="normal" draw_ops="right_middle_background_unfocused_normal"/>
2905- <button function="right_right_background" state="normal" draw_ops="right_right_background_unfocused_normal"/>
2906- <button function="right_left_background" state="prelight" draw_ops="right_left_background_unfocused_normal"/>
2907- <button function="right_middle_background" state="prelight" draw_ops="right_middle_background_unfocused_normal"/>
2908- <button function="right_right_background" state="prelight" draw_ops="right_right_background_unfocused_normal"/>
2909- <button function="right_left_background" state="pressed" draw_ops="right_left_background_unfocused_pressed"/>
2910- <button function="right_middle_background" state="pressed" draw_ops="right_middle_background_unfocused_pressed"/>
2911- <button function="right_right_background" state="pressed" draw_ops="right_right_background_unfocused_pressed"/>
2912 <button function="menu" state="normal" draw_ops="menu_unfocused_normal"/>
2913 <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight"/>
2914- <button function="menu" state="pressed" draw_ops="menu_unfocused_normal"/>
2915+ <button function="menu" state="pressed" draw_ops="menu_unfocused_normal"/>
2916 <button function="minimize" state="normal" draw_ops="minimize_unfocused_normal"/>
2917 <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
2918 <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
2919@@ -530,4 +414,4 @@
2920 <window type="utility" style_set="utility"/>
2921 <window type="border" style_set="border"/>
2922
2923-</metacity_theme>
2924+</metacity_theme>
2925
2926=== modified file 'Radiance/gtk-3.0/apps/gnome-panel.css'
2927--- Radiance/gtk-3.0/apps/gnome-panel.css 2013-07-10 16:38:17 +0000
2928+++ Radiance/gtk-3.0/apps/gnome-panel.css 2014-10-21 15:21:37 +0000
2929@@ -68,9 +68,13 @@
2930 }
2931
2932 PanelApplet .button:active:prelight:backdrop,
2933+PanelApplet .button:checked:prelight:backdrop,
2934 PanelApplet .button:active:prelight,
2935+PanelApplet .button:checked:prelight,
2936 PanelApplet .button:active:backdrop,
2937-PanelApplet .button:active {
2938+PanelApplet .button:checked:backdrop,
2939+PanelApplet .button:active ,
2940+PanelApplet .button:checked {
2941 border-image: none;
2942 background-image: -gtk-gradient (linear, left top, left bottom,
2943 from (shade (@dark_bg_color, 0.7)),
2944
2945=== modified file 'Radiance/gtk-3.0/apps/nautilus.css'
2946--- Radiance/gtk-3.0/apps/nautilus.css 2014-07-10 15:06:44 +0000
2947+++ Radiance/gtk-3.0/apps/nautilus.css 2014-10-21 15:21:37 +0000
2948@@ -18,7 +18,8 @@
2949 text-shadow: 1px 1px alpha (#000000, 0.8);
2950 }
2951
2952-.nautilus-desktop.nautilus-canvas-item:active {
2953+.nautilus-desktop.nautilus-canvas-item:active,
2954+.nautilus-desktop.nautilus-canvas-item:checked {
2955 background-image: none;
2956 background-color: alpha (@bg_color, 0.84);
2957
2958@@ -33,6 +34,7 @@
2959 }
2960
2961 .nautilus-desktop.nautilus-canvas-item:active,
2962+.nautilus-desktop.nautilus-canvas-item:checked,
2963 .nautilus-desktop.nautilus-canvas-item:prelight,
2964 .nautilus-desktop.nautilus-canvas-item:selected {
2965 text-shadow: none;
2966@@ -88,7 +90,9 @@
2967 }
2968
2969 #nautilus-search-button *:active,
2970-#nautilus-search-button *:active:prelight {
2971+#nautilus-search-button *:checked,
2972+#nautilus-search-button *:active:prelight,
2973+#nautilus-search-button *:checked:prelight {
2974 color: @dark_fg_color;
2975 }
2976
2977
2978=== modified file 'Radiance/gtk-3.0/apps/unity.css'
2979--- Radiance/gtk-3.0/apps/unity.css 2014-03-31 20:51:28 +0000
2980+++ Radiance/gtk-3.0/apps/unity.css 2014-10-21 15:21:37 +0000
2981@@ -6,9 +6,9 @@
2982
2983 -UnityDecoration-shadow-offset-x: 1px;
2984 -UnityDecoration-shadow-offset-y: 5px;
2985- -UnityDecoration-active-shadow-color: rgba (0, 0, 0, 0.78);
2986+ -UnityDecoration-active-shadow-color: @window_shadow;
2987 -UnityDecoration-active-shadow-radius: 30px;
2988- -UnityDecoration-inactive-shadow-color: rgba (0, 0, 0, 0.3);
2989+ -UnityDecoration-inactive-shadow-color: @window_shadow_inactive;
2990 -UnityDecoration-inactive-shadow-radius: 25px;
2991
2992 -UnityDecoration-glow-size: 10px;
2993@@ -19,6 +19,8 @@
2994 -UnityDecoration-title-alignment: 0.0;
2995 }
2996
2997+.titlebar,
2998+.header-bar,
2999 UnityDecoration.top {
3000 border: 1px solid rgba (85, 40, 0, 0.04); /* shade (@dark_bg_color) (shade (#edebe6, 1.06) */
3001 border-bottom-width: 0;
3002@@ -39,6 +41,12 @@
3003 0 1px shade (@dark_bg_color, 1.06), 0 -1px shade (@dark_bg_color, 1.06);
3004 }
3005
3006+UnityDecoration.top {
3007+ padding: 1px 6px 0 6px;
3008+}
3009+
3010+.titlebar:backdrop,
3011+.header-bar:backdrop,
3012 UnityDecoration.top:backdrop {
3013 border: 1px solid rgba (110, 27, 0, 0.04); /* shade @dark_bg_color - shade (#edebe6, 0.96) */
3014 border-bottom-width: 0;
3015
3016=== modified file 'Radiance/gtk-3.0/gtk-main.css'
3017--- Radiance/gtk-3.0/gtk-main.css 2014-10-13 14:58:41 +0000
3018+++ Radiance/gtk-3.0/gtk-main.css 2014-10-21 15:21:37 +0000
3019@@ -36,6 +36,10 @@
3020
3021 @define-color shadow_color alpha(black, 0.5);
3022
3023+/* window decoration colors */
3024+@define-color window_shadow rgba (0, 0, 0, 0.78);
3025+@define-color window_shadow_inactive rgba (0, 0, 0, 0.3);
3026+
3027 @import url("gtk-widgets-borders.css");
3028 @import url("gtk-widgets-borders-radiance.css");
3029 @import url("gtk-widgets-assets.css");
3030
3031=== modified file 'Radiance/gtk-3.0/gtk-widgets-assets-radiance.css'
3032--- Radiance/gtk-3.0/gtk-widgets-assets-radiance.css 2012-10-10 11:38:40 +0000
3033+++ Radiance/gtk-3.0/gtk-widgets-assets-radiance.css 2014-10-21 15:21:37 +0000
3034@@ -1,23 +1,33 @@
3035 .menu .check {
3036 background-image: url("assets/check-menuitem-unselected.png");
3037+ -gtk-icon-source: url("assets/check-menuitem-unselected.png");
3038 }
3039
3040 .menu .radio {
3041 background-image: url("assets/check-menuitem-unselected.png");
3042+ -gtk-icon-source: url("assets/check-menuitem-unselected.png");
3043 }
3044
3045-.menu .check:active {
3046+.menu .check:active,
3047+.menu .check:checked {
3048 background-image: url("assets/check-menuitem-dark.png");
3049+ -gtk-icon-source: url("assets/check-menuitem-dark.png");
3050 }
3051
3052-.menu .check:active:insensitive {
3053+.menu .check:active:insensitive,
3054+.menu .check:checked:insensitive {
3055 background-image: url("assets/check-menuitem-insensitive-dark.png");
3056+ -gtk-icon-source: url("assets/check-menuitem-insensitive-dark.png");
3057 }
3058
3059-.menu .radio:active {
3060+.menu .radio:active,
3061+.menu .radio:checked {
3062 background-image: url("assets/radio-menuitem-dark.png");
3063+ -gtk-icon-source: url("assets/radio-menuitem-dark.png");
3064 }
3065
3066-.menu .radio:active:insensitive {
3067+.menu .radio:active:insensitive,
3068+.menu .radio:checked:insensitive {
3069 background-image: url("assets/radio-menuitem-insensitive-dark.png");
3070-}
3071\ No newline at end of file
3072+ -gtk-icon-source: url("assets/radio-menuitem-insensitive-dark.png");
3073+}
3074
3075=== modified file 'Radiance/gtk-3.0/gtk-widgets-assets.css'
3076--- Radiance/gtk-3.0/gtk-widgets-assets.css 2014-01-10 17:18:52 +0000
3077+++ Radiance/gtk-3.0/gtk-widgets-assets.css 2014-10-21 15:21:37 +0000
3078@@ -5,6 +5,7 @@
3079 .grip {
3080 background-color: transparent;
3081 /*background-image: url("assets/resize-grip.svg");*/
3082+ /*-gtk-icon-source: url("assets/resize-grip.svg");*/
3083 }
3084
3085 /*************************
3086@@ -19,26 +20,31 @@
3087
3088 .check {
3089 background-image: url("assets/check-unselected.png");
3090+ -gtk-icon-source: url("assets/check-unselected.png");
3091 }
3092
3093 .check:hover {
3094 background-image: url("assets/check-unselected-hover.png");
3095+ -gtk-icon-source: url("assets/check-unselected-hover.png");
3096 }
3097
3098 .check row,
3099 .check row:selected,
3100 .check row:selected:focus {
3101 background-image: url("assets/check-unselected-alt.png");
3102+ -gtk-icon-source: url("assets/check-unselected-alt.png");
3103 }
3104
3105 .check row:hover,
3106 .check row:selected:hover,
3107 .check row:selected:focus:hover {
3108 background-image: url("assets/check-unselected-hover-alt.png");
3109+ -gtk-icon-source: url("assets/check-unselected-hover-alt.png");
3110 }
3111
3112 .check:insensitive {
3113 background-image: url("assets/check-unselected-disabled.png");
3114+ -gtk-icon-source: url("assets/check-unselected-disabled.png");
3115 }
3116
3117 .check row:insensitive {
3118@@ -50,168 +56,224 @@
3119 .check row:selected:focus:insensitive {
3120 background-color: transparent;
3121 background-image: url("assets/check-unselected-disabled-alt.png");
3122+ -gtk-icon-source: url("assets/check-unselected-disabled-alt.png");
3123 }
3124
3125 .check:backdrop {
3126 background-image: url("assets/backdrop-check-unselected.png");
3127+ -gtk-icon-source: url("assets/backdrop-check-unselected.png");
3128 }
3129
3130 .check:hover:backdrop {
3131 background-image: url("assets/backdrop-check-unselected-hover.png");
3132+ -gtk-icon-source: url("assets/backdrop-check-unselected-hover.png");
3133 }
3134
3135 .check row:backdrop,
3136 .check row:selected:backdrop {
3137 background-image: url("assets/backdrop-check-unselected-alt.png");
3138+ -gtk-icon-source: url("assets/backdrop-check-unselected-alt.png");
3139 }
3140
3141 .check row:hover:backdrop,
3142 .check row:selected:hover:backdrop {
3143 background-image: url("assets/backdrop-check-unselected-hover-alt.png");
3144+ -gtk-icon-source: url("assets/backdrop-check-unselected-hover-alt.png");
3145 }
3146
3147 .check:insensitive:backdrop {
3148 background-image: url("assets/backdrop-check-unselected-disabled.png");
3149+ -gtk-icon-source: url("assets/backdrop-check-unselected-disabled.png");
3150 }
3151
3152 .check row:selected:insensitive:backdrop {
3153 background-image: url("assets/backdrop-check-unselected-disabled-alt.png");
3154+ -gtk-icon-source: url("assets/backdrop-check-unselected-disabled-alt.png");
3155 }
3156
3157-.check:active {
3158+.check:active,
3159+.check:checked {
3160 background-image: url("assets/check-selected.png");
3161+ -gtk-icon-source: url("assets/check-selected.png");
3162 }
3163
3164-.check:active:hover {
3165+.check:active:hover,
3166+.check:checked:hover {
3167 background-image: url("assets/check-selected-hover.png");
3168+ -gtk-icon-source: url("assets/check-selected-hover.png");
3169 }
3170
3171 .check row:active,
3172+.check row:checked,
3173 .check row:selected:active,
3174-.check row:selected:focus:active {
3175+.check row:selected:checked,
3176+.check row:selected:focus:active,
3177+.check row:selected:focus:checked {
3178 background-image: url("assets/check-selected-alt.png");
3179+ -gtk-icon-source: url("assets/check-selected-alt.png");
3180 }
3181
3182 .check row:active:hover,
3183+.check row:checked:hover,
3184 .check row:selected:active:hover,
3185-.check row:selected:active:focus:hover {
3186+.check row:selected:checked:hover,
3187+.check row:selected:active:focus:hover,
3188+.check row:selected:checked:focus:hover {
3189 background-image: url("assets/check-selected-hover-alt.png");
3190+ -gtk-icon-source: url("assets/check-selected-hover-alt.png");
3191 }
3192
3193-.check:active:insensitive {
3194+.check:active:insensitive,
3195+.check:checked:insensitive {
3196 background-image: url("assets/check-selected-disabled.png");
3197+ -gtk-icon-source: url("assets/check-selected-disabled.png");
3198 }
3199
3200 .check row:active:insensitive,
3201+.check row:checked:insensitive,
3202 .check row:selected:active:insensitive,
3203-.check row:selected:focus:active:insensitive {
3204+.check row:selected:checked:insensitive,
3205+.check row:selected:focus:active:insensitive,
3206+.check row:selected:focus:checked:insensitive {
3207 background-image: url("assets/check-selected-disabled-alt.png");
3208+ -gtk-icon-source: url("assets/check-selected-disabled-alt.png");
3209 }
3210
3211-.check:active:backdrop {
3212+.check:active:backdrop,
3213+.check:checked:backdrop {
3214 background-image: url("assets/backdrop-check-selected.png");
3215+ -gtk-icon-source: url("assets/backdrop-check-selected.png");
3216 }
3217
3218-.check:active:backdrop {
3219+.check:active:backdrop,
3220+.check:checked:backdrop {
3221 background-image: url("assets/backdrop-check-selected-hover.png");
3222+ -gtk-icon-source: url("assets/backdrop-check-selected-hover.png");
3223 }
3224
3225 .check row:active:backdrop,
3226-.check row:selected:active:backdrop {
3227+.check row:checked:backdrop,
3228+.check row:selected:active:backdrop,
3229+.check row:selected:checked:backdrop {
3230 background-image: url("assets/backdrop-check-selected-alt.png");
3231+ -gtk-icon-source: url("assets/backdrop-check-selected-alt.png");
3232 }
3233
3234 .check row:active:hover:backdrop,
3235-.check row:selected:active:hover:backdrop {
3236+.check row:checked:hover:backdrop,
3237+.check row:selected:active:hover:backdrop,
3238+.check row:selected:checked:hover:backdrop {
3239 background-image: url("assets/backdrop-check-selected-hover-alt.png");
3240+ -gtk-icon-source: url("assets/backdrop-check-selected-hover-alt.png");
3241 }
3242
3243-.check:active:insensitive:backdrop {
3244+.check:active:insensitive:backdrop,
3245+.check:checked:insensitive:backdrop {
3246 background-image: url("assets/backdrop-check-selected-disabled.png");
3247+ -gtk-icon-source: url("assets/backdrop-check-selected-disabled.png");
3248 }
3249
3250-.check row:selected:active:insensitive:backdrop {
3251+.check row:selected:active:insensitive:backdrop,
3252+.check row:selected:checked:insensitive:backdrop {
3253 background-image: url("assets/backdrop-check-selected-disabled-alt.png");
3254+ -gtk-icon-source: url("assets/backdrop-check-selected-disabled-alt.png");
3255 }
3256
3257 .check:inconsistent {
3258 background-image: url("assets/check-mixed.png");
3259+ -gtk-icon-source: url("assets/check-mixed.png");
3260 }
3261
3262 .check:inconsistent:hover {
3263 background-image: url("assets/check-mixed-hover.png");
3264+ -gtk-icon-source: url("assets/check-mixed-hover.png");
3265 }
3266
3267 .check row:inconsistent,
3268 .check row:selected:inconsistent,
3269 .check row:selected:focus:inconsistent {
3270 background-image: url("assets/check-mixed-alt.png");
3271+ -gtk-icon-source: url("assets/check-mixed-alt.png");
3272 }
3273
3274 .check row:inconsistent:hover,
3275 .check row:selected:inconsistent:hover,
3276 .check row:selected:focus:inconsistent:hover {
3277 background-image: url("assets/check-mixed-hover-alt.png");
3278+ -gtk-icon-source: url("assets/check-mixed-hover-alt.png");
3279 }
3280
3281 .check:inconsistent:insensitive {
3282 background-image: url("assets/check-mixed-disabled.png");
3283+ -gtk-icon-source: url("assets/check-mixed-disabled.png");
3284 }
3285
3286 .check row:inconsistent:insensitive,
3287 .check row:selected:inconsistent:insensitive,
3288 .check row:selected:focus:inconsistent:insensitive {
3289 background-image: url("assets/check-mixed-disabled-alt.png");
3290+ -gtk-icon-source: url("assets/check-mixed-disabled-alt.png");
3291 }
3292
3293 .check:inconsistent:backdrop {
3294 background-image: url("assets/backdrop-check-mixed.png");
3295+ -gtk-icon-source: url("assets/backdrop-check-mixed.png");
3296 }
3297
3298 .check:inconsistent:hover:backdrop {
3299 background-image: url("assets/backdrop-check-mixed-hover.png");
3300+ -gtk-icon-source: url("assets/backdrop-check-mixed-hover.png");
3301 }
3302
3303 .check row:inconsistent:backdrop,
3304 .check row:selected:inconsistent:backdrop {
3305 background-image: url("assets/backdrop-check-mixed-alt.png");
3306+ -gtk-icon-source: url("assets/backdrop-check-mixed-alt.png");
3307 }
3308
3309 .check row:inconsistent:hover:backdrop,
3310 .check row:selected:inconsistent:hover:backdrop {
3311 background-image: url("assets/backdrop-check-mixed-hover-alt.png");
3312+ -gtk-icon-source: url("assets/backdrop-check-mixed-hover-alt.png");
3313 }
3314
3315 .check:inconsistent:insensitive:backdrop {
3316 background-image: url("assets/backdrop-check-mixed-disabled.png");
3317+ -gtk-icon-source: url("assets/backdrop-check-mixed-disabled.png");
3318 }
3319
3320 .check row:selected:inconsistent:insensitive:backdrop {
3321 background-image: url("assets/backdrop-check-mixed-disabled-alt.png");
3322+ -gtk-icon-source: url("assets/backdrop-check-mixed-disabled-alt.png");
3323 }
3324
3325 .radio {
3326 background-image: url("assets/radio-unselected.png");
3327+ -gtk-icon-source: url("assets/radio-unselected.png");
3328 }
3329
3330 .radio:hover {
3331 background-image: url("assets/radio-unselected-hover.png");
3332+ -gtk-icon-source: url("assets/radio-unselected-hover.png");
3333 }
3334
3335 .radio row,
3336 .radio row:selected,
3337 .radio row:selected:focus {
3338 background-image: url("assets/radio-unselected-alt.png");
3339+ -gtk-icon-source: url("assets/radio-unselected-alt.png");
3340 }
3341
3342 .radio row:hover,
3343 .radio row:selected:hover,
3344 .radio row:selected:focus:hover {
3345 background-image: url("assets/radio-unselected-hover-alt.png");
3346+ -gtk-icon-source: url("assets/radio-unselected-hover-alt.png");
3347 }
3348
3349 .radio:insensitive {
3350 background-image: url("assets/radio-unselected-disabled.png");
3351+ -gtk-icon-source: url("assets/radio-unselected-disabled.png");
3352 }
3353
3354 .radio row:insensitive {
3355@@ -222,164 +284,223 @@
3356 .radio row:selected:insensitive,
3357 .radio row:selected:focus:insensitive {
3358 background-image: url("assets/radio-unselected-disabled-alt.png");
3359+ -gtk-icon-source: url("assets/radio-unselected-disabled-alt.png");
3360 }
3361
3362 .radio:backdrop {
3363 background-image: url("assets/backdrop-radio-unselected.png");
3364+ -gtk-icon-source: url("assets/backdrop-radio-unselected.png");
3365 }
3366
3367 .radio:hover:backdrop {
3368 background-image: url("assets/backdrop-radio-unselected-hover.png");
3369+ -gtk-icon-source: url("assets/backdrop-radio-unselected-hover.png");
3370 }
3371
3372 .radio row:backdrop,
3373 .radio row:selected:backdrop {
3374 background-image: url("assets/backdrop-radio-unselected-alt.png");
3375+ -gtk-icon-source: url("assets/backdrop-radio-unselected-alt.png");
3376 }
3377
3378 .radio row:hover:backdrop,
3379 .radio row:selected:hover:backdrop {
3380 background-image: url("assets/backdrop-radio-unselected-hover-alt.png");
3381+ -gtk-icon-source: url("assets/backdrop-radio-unselected-hover-alt.png");
3382 }
3383
3384 .radio:insensitive:backdrop {
3385 background-image: url("assets/backdrop-radio-unselected-disabled.png");
3386+ -gtk-icon-source: url("assets/backdrop-radio-unselected-disabled.png");
3387 }
3388
3389 .radio row:selected:insensitive:backdrop {
3390 background-image: url("assets/backdrop-radio-unselected-disabled-alt.png");
3391+ -gtk-icon-source: url("assets/backdrop-radio-unselected-disabled-alt.png");
3392 }
3393
3394-.radio:active {
3395+.radio:active,
3396+.radio:checked {
3397 background-image: url("assets/radio-selected.png");
3398+ -gtk-icon-source: url("assets/radio-selected.png");
3399 }
3400
3401-.radio:active:hover {
3402+.radio:active:hover,
3403+.radio:checked:hover {
3404 background-image: url("assets/radio-selected-hover.png");
3405+ -gtk-icon-source: url("assets/radio-selected-hover.png");
3406 }
3407
3408 .radio row:active,
3409+.radio row:checked,
3410 .radio row:selected:active,
3411-.radio row:selected:focus:active {
3412+.radio row:selected:checked,
3413+.radio row:selected:focus:active,
3414+.radio row:selected:focus:checked {
3415 background-image: url("assets/radio-selected-alt.png");
3416+ -gtk-icon-source: url("assets/radio-selected-alt.png");
3417 }
3418
3419 .radio row:active:hover,
3420+.radio row:checked:hover,
3421 .radio row:selected:active:hover,
3422-.radio row:selected:focus:active:hover {
3423+.radio row:selected:checked:hover,
3424+.radio row:selected:focus:active:hover,
3425+.radio row:selected:focus:checked:hover {
3426 background-image: url("assets/radio-selected-hover-alt.png");
3427+ -gtk-icon-source: url("assets/radio-selected-hover-alt.png");
3428 }
3429
3430-.radio:active:insensitive {
3431+.radio:active:insensitive,
3432+.radio:checked:insensitive {
3433 background-image: url("assets/radio-selected-disabled.png");
3434+ -gtk-icon-source: url("assets/radio-selected-disabled.png");
3435 }
3436
3437 .radio row:insensitive,
3438 .radio row:selected:active:insensitive,
3439-.radio row:selected:focus:active:insensitive {
3440+.radio row:selected:checked:insensitive,
3441+.radio row:selected:focus:active:insensitive,
3442+.radio row:selected:focus:checked:insensitive {
3443 background-image: url("assets/radio-selected-disabled-alt.png");
3444+ -gtk-icon-source: url("assets/radio-selected-disabled-alt.png");
3445 }
3446
3447-.radio:active:backdrop {
3448+.radio:active:backdrop,
3449+.radio:checked:backdrop {
3450 background-image: url("assets/backdrop-radio-selected.png");
3451+ -gtk-icon-source: url("assets/backdrop-radio-selected.png");
3452 }
3453
3454-.radio:active:hover:backdrop {
3455+.radio:active:hover:backdrop,
3456+.radio:checked:hover:backdrop {
3457 background-image: url("assets/backdrop-radio-selected-hover.png");
3458+ -gtk-icon-source: url("assets/backdrop-radio-selected-hover.png");
3459 }
3460
3461 .radio row:active:backdrop,
3462-.radio row:selected:active:backdrop {
3463+.radio row:checked:backdrop,
3464+.radio row:selected:active:backdrop,
3465+.radio row:selected:checked:backdrop {
3466 background-image: url("assets/backdrop-radio-selected-alt.png");
3467+ -gtk-icon-source: url("assets/backdrop-radio-selected-alt.png");
3468 }
3469
3470 .radio row:active:hover:backdrop,
3471-.radio row:selected:active:hover:backdrop {
3472+.radio row:checked:hover:backdrop,
3473+.radio row:selected:active:hover:backdrop,
3474+.radio row:selected:checked:hover:backdrop {
3475 background-image: url("assets/backdrop-radio-selected-hover-alt.png");
3476+ -gtk-icon-source: url("assets/backdrop-radio-selected-hover-alt.png");
3477 }
3478
3479-.radio:active:insensitive:backdrop {
3480+.radio:active:insensitive:backdrop,
3481+.radio:checked:insensitive:backdrop {
3482 background-image: url("assets/backdrop-radio-selected-disabled.png");
3483+ -gtk-icon-source: url("assets/backdrop-radio-selected-disabled.png");
3484 }
3485
3486-.radio row:selected:active:insensitive:backdrop {
3487+.radio row:selected:active:insensitive:backdrop,
3488+.radio row:selected:checked:insensitive:backdrop {
3489 background-image: url("assets/backdrop-radio-selected-disabled-alt.png");
3490+ -gtk-icon-source: url("assets/backdrop-radio-selected-disabled-alt.png");
3491 }
3492
3493 .radio:inconsistent {
3494 background-image: url("assets/radio-mixed.png");
3495+ -gtk-icon-source: url("assets/radio-mixed.png");
3496 }
3497
3498 .radio:inconsistent:hover {
3499 background-image: url("assets/radio-mixed-hover.png");
3500+ -gtk-icon-source: url("assets/radio-mixed-hover.png");
3501 }
3502
3503 .radio row:inconsistent,
3504 .radio row:selected:inconsistent,
3505 .radio row:selected:focus:inconsistent {
3506 background-image: url("assets/radio-mixed-alt.png");
3507+ -gtk-icon-source: url("assets/radio-mixed-alt.png");
3508 }
3509
3510 .radio row:inconsistent:hover,
3511 .radio row:selected:inconsistent:hover,
3512 .radio row:selected:focus:inconsistent:hover {
3513 background-image: url("assets/radio-mixed-hover-alt.png");
3514+ -gtk-icon-source: url("assets/radio-mixed-hover-alt.png");
3515 }
3516
3517 .radio:inconsistent:insensitive {
3518 background-image: url("assets/radio-mixed-disabled.png");
3519+ -gtk-icon-source: url("assets/radio-mixed-disabled.png");
3520 }
3521
3522 .radio row:inconsistent:insensitive,
3523 .radio row:selected:inconsistent:insensitive,
3524 .radio row:selected:focus:inconsistent:insensitive {
3525 background-image: url("assets/radio-mixed-disabled-alt.png");
3526+ -gtk-icon-source: url("assets/radio-mixed-disabled-alt.png");
3527 }
3528
3529 .radio:inconsistent:backdrop {
3530 background-image: url("assets/backdrop-radio-mixed.png");
3531+ -gtk-icon-source: url("assets/backdrop-radio-mixed.png");
3532 }
3533
3534 .radio:inconsistent:hover:backdrop {
3535 background-image: url("assets/backdrop-radio-mixed-hover.png");
3536+ -gtk-icon-source: url("assets/backdrop-radio-mixed-hover.png");
3537 }
3538
3539 .radio row:inconsistent:backdrop,
3540 .radio row:selected:inconsistent:backdrop {
3541 background-image: url("assets/backdrop-radio-mixed-alt.png");
3542+ -gtk-icon-source: url("assets/backdrop-radio-mixed-alt.png");
3543 }
3544
3545 .radio row:inconsistent:hover:backdrop,
3546 .radio row:selected:inconsistent:hover:backdrop {
3547 background-image: url("assets/backdrop-radio-mixed-hover-alt.png");
3548+ -gtk-icon-source: url("assets/backdrop-radio-mixed-hover-alt.png");
3549 }
3550
3551 .radio:inconsistent:insensitive:backdrop {
3552 background-image: url("assets/backdrop-radio-mixed-disabled.png");
3553+ -gtk-icon-source: url("assets/backdrop-radio-mixed-disabled.png");
3554 }
3555
3556 .radio row:selected:inconsistent:insensitive:backdrop {
3557 background-image: url("assets/backdrop-radio-mixed-disabled-alt.png");
3558+ -gtk-icon-source: url("assets/backdrop-radio-mixed-disabled-alt.png");
3559 }
3560
3561 /*.sidebar .radio:active,
3562+.sidebar .radio:checked,
3563 .sidebar .radio:active:focus,
3564-.sidebar .radio:active:hover {
3565+.sidebar .radio:checked:focus,
3566+.sidebar .radio:active:hover,
3567+.sidebar .radio:checked:hover {
3568 background-image: url("assets/sidebar-radio-selected.svg");
3569+ -gtk-icon-source: url("assets/sidebar-radio-selected.svg");
3570 }
3571
3572 .sidebar .radio:hover {
3573 background-image: url("assets/sidebar-radio-prelight.svg");
3574+ -gtk-icon-source: url("assets/sidebar-radio-prelight.svg");
3575 }
3576
3577 .sidebar .radio:active:selected,
3578-.sidebar .radio:active:selected:focus {
3579+.sidebar .radio:checked:selected,
3580+.sidebar .radio:active:selected:focus,
3581+.sidebar .radio:checked:selected:focus {
3582 background-image: url("assets/sidebar-radio-selected.svg");
3583+ -gtk-icon-source: url("assets/sidebar-radio-selected.svg");
3584 }
3585
3586 .sidebar .radio:selected:hover,
3587 .sidebar .radio:selected:focus {
3588 background-image: url("assets/sidebar-radio-selected-prelight.svg");
3589+ -gtk-icon-source: url("assets/sidebar-radio-selected-prelight.svg");
3590 }*/
3591
3592 .primary-toolbar .menu .check,
3593@@ -387,6 +508,7 @@
3594 .header-bar .menu .check,
3595 .menu .check {
3596 background-image: url("assets/check-menuitem-unselected.png");
3597+ -gtk-icon-source: url("assets/check-menuitem-unselected.png");
3598 }
3599
3600 .primary-toolbar .menu .radio,
3601@@ -394,65 +516,100 @@
3602 .header-bar .menu .radio,
3603 .menu .radio {
3604 background-image: url("assets/check-menuitem-unselected.png");
3605+ -gtk-icon-source: url("assets/check-menuitem-unselected.png");
3606 }
3607
3608 .primary-toolbar .menu .check:active,
3609+.primary-toolbar .menu .check:checked,
3610 .menubar.toolbar .menu .check:active,
3611+.menubar.toolbar .menu .check:checked,
3612 .header-bar .menu .check:active,
3613-.menu .check:active {
3614+.header-bar .menu .check:checked,
3615+.menu .check:active,
3616+.menu .check:checked {
3617 background-image: url("assets/check-menuitem-dark.png");
3618 }
3619
3620 .toolbar .menu .check:active:hover,
3621-.menu .check:active:hover {
3622+.toolbar .menu .check:checked:hover,
3623+.menu .check:active:hover,
3624+.menu .check:checked:hover {
3625 background-image: url("assets/check-menuitem.png");
3626+ -gtk-icon-source: url("assets/check-menuitem.png");
3627 }
3628
3629 .primary-toolbar .menu .check:active:insensitive,
3630+.primary-toolbar .menu .check:checked:insensitive,
3631 .menubar.toolbar .menu .check:active:insensitive,
3632+.menubar.toolbar .menu .check:checked:insensitive,
3633 .header-bar .menu .check:active:insensitive,
3634+.header-bar .menu .check:checked:insensitive,
3635 .toolbar .menu .check:active:hover:insensitive,
3636+.toolbar .menu .check:checked:hover:insensitive,
3637 .menu .check:active:insensitive,
3638-.menu .check:active:hover:insensitive {
3639+.menu .check:checked:insensitive,
3640+.menu .check:active:hover:insensitive,
3641+.menu .check:checked:hover:insensitive {
3642 background-image: url("assets/check-menuitem-insensitive.png");
3643+ -gtk-icon-source: url("assets/check-menuitem-insensitive.png");
3644 }
3645
3646 .toolbar .menu .radio:active:hover,
3647-.menu .radio:active {
3648+.toolbar .menu .radio:checked:hover,
3649+.menu .radio:active,
3650+.menu .radio:checked {
3651 background-image: url("assets/radio-menuitem.png");
3652+ -gtk-icon-source: url("assets/radio-menuitem.png");
3653 }
3654
3655 .primary-toolbar .menu .radio:active:insensitive,
3656+.primary-toolbar .menu .radio:checked:insensitive,
3657 .menubar.toolbar .menu .radio:active:insensitive,
3658+.menubar.toolbar .menu .radio:checked:insensitive,
3659 .header-bar .menu .radio:active:insensitive,
3660+.header-bar .menu .radio:checked:insensitive,
3661 .toolbar .menu .radio:active:hover:insensitive,
3662+.toolbar .menu .radio:checked:hover:insensitive,
3663 .menu .radio:active:insensitive,
3664-.menu .radio:active:hover:insensitive {
3665+.menu .radio:checked:insensitive,
3666+.menu .radio:active:hover:insensitive,
3667+.menu .radio:checked:hover:insensitive {
3668 background-image: url("assets/radio-menuitem-insensitive.png");
3669+ -gtk-icon-source: url("assets/radio-menuitem-insensitive.png");
3670 }
3671
3672 .toolbar .menu .check {
3673 background-image: url("assets/check-menuitem-unselected.png");
3674+ -gtk-icon-source: url("assets/check-menuitem-unselected.png");
3675 }
3676
3677 .toolbar .menu .radio {
3678 background-image: url("assets/check-menuitem-unselected.png");
3679+ -gtk-icon-source: url("assets/check-menuitem-unselected.png");
3680 }
3681
3682-.toolbar .menu .check:active {
3683+.toolbar .menu .check:active,
3684+.toolbar .menu .check:checked {
3685 background-image: url("assets/check-menuitem-dark.png");
3686+ -gtk-icon-source: url("assets/check-menuitem-dark.png");
3687 }
3688
3689-.toolbar .menu .check:active:insensitive {
3690+.toolbar .menu .check:active:insensitive,
3691+.toolbar .menu .check:checked:insensitive {
3692 background-image: url("assets/check-menuitem-insensitive-dark.png");
3693+ -gtk-icon-source: url("assets/check-menuitem-insensitive-dark.png");
3694 }
3695
3696-.toolbar .menu .radio:active {
3697+.toolbar .menu .radio:active,
3698+.toolbar .menu .radio:checked {
3699 background-image: url("assets/radio-menuitem-dark.png");
3700+ -gtk-icon-source: url("assets/radio-menuitem-dark.png");
3701 }
3702
3703-.toolbar .menu .radio:active:insensitive {
3704+.toolbar .menu .radio:active:insensitive,
3705+.toolbar .menu .radio:checked:insensitive {
3706 background-image: url("assets/radio-menuitem-insensitive-dark.png");
3707+ -gtk-icon-source: url("assets/radio-menuitem-insensitive-dark.png");
3708 }
3709
3710 /*********************
3711@@ -461,127 +618,157 @@
3712 .scale.slider,
3713 .scale.slider.horizontal {
3714 background-image: url("assets/slider-horizontal.png");
3715+ -gtk-icon-source: url("assets/slider-horizontal.png");
3716 }
3717
3718 .scale.slider:backdrop,
3719 .scale.slider.horizontal:backdrop {
3720 /*background-image: url("assets/slider-horizontal-disabled.png");*/
3721+ /*-gtk-icon-source: url("assets/slider-horizontal-disabled.png");*/
3722 }
3723
3724 .scale.slider:hover,
3725 .scale.slider.horizontal:hover {
3726 background-image: url("assets/slider-horizontal-hover.png");
3727+ -gtk-icon-source: url("assets/slider-horizontal-hover.png");
3728 }
3729
3730 .scale.slider:focused,
3731 .scale.slider.horizontal:focused {
3732 background-image: url("assets/slider-horizontal-focused.png");
3733+ -gtk-icon-source: url("assets/slider-horizontal-focused.png");
3734 }
3735
3736 .scale.slider:hover:focused,
3737 .scale.slider.horizontal:hover:focused {
3738 background-image: url("assets/slider-horizontal-focused-hover.png");
3739+ -gtk-icon-source: url("assets/slider-horizontal-focused-hover.png");
3740 }
3741
3742 .scale.slider:insensitive,
3743 .scale.slider.horizontal:insensitive {
3744 background-image: url("assets/slider-horizontal-disabled.png");
3745+ -gtk-icon-source: url("assets/slider-horizontal-disabled.png");
3746 }
3747
3748 .scale.slider:insensitive:backdrop,
3749 .scale.slider.horizontal:insensitive:backdrop {
3750 /*background-image: url("assets/slider-horizontal-backdrop-disabled.png");*/
3751+ /*-gtk-icon-source: url("assets/slider-horizontal-backdrop-disabled.png");*/
3752 }
3753
3754 .scale.slider.vertical {
3755 background-image: url("assets/slider-vertical.png");
3756+ -gtk-icon-source: url("assets/slider-vertical.png");
3757 }
3758
3759 .scale.slider.vertical:backdrop {
3760 /*background-image: url("assets/slider-vertical-backdrop.png");*/
3761+ /*-gtk-icon-source: url("assets/slider-vertical-backdrop.png");*/
3762 }
3763
3764 .scale.slider.vertical:hover {
3765 background-image: url("assets/slider-vertical-hover.png");
3766+ -gtk-icon-source: url("assets/slider-vertical-hover.png");
3767 }
3768
3769 .scale.slider.vertical:focused {
3770 background-image: url("assets/slider-vertical-focused.png");
3771+ -gtk-icon-source: url("assets/slider-vertical-focused.png");
3772 }
3773
3774 .scale.slider.vertical:hover:focused {
3775 background-image: url("assets/slider-vertical-focused-hover.png");
3776+ -gtk-icon-source: url("assets/slider-vertical-focused-hover.png");
3777 }
3778
3779 .scale.slider.vertical:insensitive {
3780 background-image: url("assets/slider-vertical-disabled.png");
3781+ -gtk-icon-source: url("assets/slider-vertical-disabled.png");
3782 }
3783
3784 .scale.slider.vertical:insensitive:backdrop {
3785 /*background-image: url("assets/slider-vertical-backdrop-disabled.png");*/
3786+ /*-gtk-icon-source: url("assets/slider-vertical-backdrop-disabled.png");*/
3787 }
3788
3789 /*.scale.scale-has-marks-above.slider.horizontal {
3790 background-image: url("assets/slider-up.png");
3791+ -gtk-icon-source: url("assets/slider-up.png");
3792 }
3793
3794 .scale.scale-has-marks-above.slider.horizontal:insensitive {
3795 background-image: url("assets/slider-up-disabled.png");
3796+ -gtk-icon-source: url("assets/slider-up-disabled.png");
3797 }
3798
3799 .scale.scale-has-marks-above.slider.horizontal:backdrop {
3800 background-image: url("assets/slider-up-backdrop.png");
3801+ -gtk-icon-source: url("assets/slider-up-backdrop.png");
3802 }
3803
3804 .scale.scale-has-marks-above.slider.horizontal:backdrop:insensitive {
3805 background-image: url("assets/slider-up-backdrop-disabled.png");
3806+ -gtk-icon-source: url("assets/slider-up-backdrop-disabled.png");
3807 }
3808
3809 .scale.scale-has-marks-above.slider.vertical {
3810 background-image: url("assets/slider-left.png");
3811+ -gtk-icon-source: url("assets/slider-left.png");
3812 }
3813
3814 .scale.scale-has-marks-above.slider.vertical:insensitive {
3815 background-image: url("assets/slider-left-disabled.png");
3816+ -gtk-icon-source: url("assets/slider-left-disabled.png");
3817 }
3818
3819 .scale.scale-has-marks-above.slider.vertical:backdrop {
3820 background-image: url("assets/slider-left-backdrop.png");
3821+ -gtk-icon-source: url("assets/slider-left-backdrop.png");
3822 }
3823
3824 .scale.scale-has-marks-above.slider.vertical:backdrop:insensitive {
3825 background-image: url("assets/slider-left-backdrop-disabled.png");
3826+ -gtk-icon-source: url("assets/slider-left-backdrop-disabled.png");
3827 }
3828
3829 .scale.scale-has-marks-below.slider.horizontal {
3830 background-image: url("assets/slider-down.png");
3831+ -gtk-icon-source: url("assets/slider-down.png");
3832 }
3833
3834 .scale.scale-has-marks-below.slider.horizontal:insensitive {
3835 background-image: url("assets/slider-down-disabled.png");
3836+ -gtk-icon-source: url("assets/slider-down-disabled.png");
3837 }
3838
3839 .scale.scale-has-marks-below.slider.horizontal:backdrop {
3840 background-image: url("assets/slider-down-backdrop.png");
3841+ -gtk-icon-source: url("assets/slider-down-backdrop.png");
3842 }
3843
3844 .scale.scale-has-marks-below.slider.horizontal:backdrop:insensitive {
3845 background-image: url("assets/slider-down-backdrop-disabled.png");
3846+ -gtk-icon-source: url("assets/slider-down-backdrop-disabled.png");
3847 }
3848
3849 .scale.scale-has-marks-below.slider.vertical {
3850 background-image: url("assets/slider-right.png");
3851+ -gtk-icon-source: url("assets/slider-right.png");
3852 }
3853
3854 .scale.scale-has-marks-below.slider.vertical:insensitive {
3855 background-image: url("assets/slider-right-disabled.png");
3856+ -gtk-icon-source: url("assets/slider-right-disabled.png");
3857 }
3858
3859 .scale.scale-has-marks-below.slider.vertical:backdrop {
3860 background-image: url("assets/slider-right-backdrop.png");
3861+ -gtk-icon-source: url("assets/slider-right-backdrop.png");
3862 }
3863
3864 .scale.scale-has-marks-below.slider.vertical:backdrop:insensitive {
3865 background-image: url("assets/slider-right-backdrop-disabled.png");
3866+ -gtk-icon-source: url("assets/slider-right-backdrop-disabled.png");
3867 }*/
3868
3869
3870=== modified file 'Radiance/gtk-3.0/gtk-widgets-backdrop.css'
3871--- Radiance/gtk-3.0/gtk-widgets-backdrop.css 2013-11-11 12:28:29 +0000
3872+++ Radiance/gtk-3.0/gtk-widgets-backdrop.css 2014-10-21 15:21:37 +0000
3873@@ -34,7 +34,8 @@
3874 -unico-inner-stroke-color: alpha (shade (@bg_color, 1.26), 0.3);
3875 }
3876
3877-.notebook tab:active:backdrop {
3878+.notebook tab:active:backdrop,
3879+.notebook tab:checked:backdrop {
3880 background-image: -gtk-gradient (linear, left top, left bottom,
3881 from (shade (@bg_color, 1.1)),
3882 to (shade (@bg_color, 1.01)));
3883@@ -94,9 +95,13 @@
3884 }
3885
3886 .button:active:backdrop,
3887+.button:checked:backdrop,
3888 GtkComboBox.combobox-entry .button:active:backdrop,
3889+GtkComboBox.combobox-entry .button:checked:backdrop,
3890 .notebook .button:active:backdrop,
3891-.inline-toolbar.toolbar .button:active:backdrop {
3892+.notebook .button:checked:backdrop,
3893+.inline-toolbar.toolbar .button:active:backdrop,
3894+.inline-toolbar.toolbar .button:checked:backdrop {
3895 background-image: -gtk-gradient (linear, left top, left bottom,
3896 from (shade (@bg_color, 0.9)),
3897 to (shade (@bg_color, 0.95)));
3898@@ -112,9 +117,13 @@
3899 }
3900
3901 .button:active:hover:backdrop,
3902+.button:checked:hover:backdrop,
3903 GtkComboBox.combobox-entry .button:active:hover:backdrop,
3904+GtkComboBox.combobox-entry .button:checked:hover:backdrop,
3905 .notebook .button:active:hover:backdrop,
3906-.inline-toolbar.toolbar .button:active:hover:backdrop {
3907+.notebook .button:checked:hover:backdrop,
3908+.inline-toolbar.toolbar .button:active:hover:backdrop,
3909+.inline-toolbar.toolbar .button:checked:hover:backdrop {
3910 background-image: -gtk-gradient (linear, left top, left bottom,
3911 from (shade (@bg_color, 0.95)),
3912 to (shade (@bg_color, 1.0)));
3913@@ -180,7 +189,8 @@
3914 to (mix (shade (@backdrop_selected_bg_color, 0.95), @bg_color, 0.3)));
3915 }
3916
3917-.button.default:active:backdrop {
3918+.button.default:active:backdrop,
3919+.button.default:checked:backdrop {
3920 background-image: -gtk-gradient (linear, left top, left bottom,
3921 from (mix (shade (@backdrop_selected_bg_color, 0.95), @bg_color, 0.3)),
3922 to (mix (shade (@backdrop_selected_bg_color, 1.05), @bg_color, 0.3)));
3923@@ -193,7 +203,8 @@
3924 to (mix (shade (@backdrop_selected_bg_color, 1.0), @bg_color, 0.3)));
3925 }
3926
3927-.button.default:active:hover:backdrop {
3928+.button.default:active:hover:backdrop,
3929+.button.default:checked:hover:backdrop {
3930 background-image: -gtk-gradient (linear, left top, left bottom,
3931 from (mix (shade (@backdrop_selected_bg_color, 1.0), @bg_color, 0.3)),
3932 to (mix (shade (@backdrop_selected_bg_color, 1.1), @bg_color, 0.3)));
3933@@ -214,22 +225,30 @@
3934 .linked .entry:backdrop,
3935 .linked .button:backdrop,
3936 .linked .button:active:backdrop,
3937+.linked .button:checked:backdrop,
3938 .linked .button:active:hover:backdrop,
3939+.linked .button:checked:hover:backdrop,
3940 .linked .button:insensitive:backdrop,
3941 .primary-toolbar .linked .entry:backdrop,
3942 .primary-toolbar .linked .button:backdrop,
3943 .primary-toolbar .linked .button:active:backdrop,
3944+.primary-toolbar .linked .button:checked:backdrop,
3945 .primary-toolbar .linked .button:active:hover:backdrop,
3946+.primary-toolbar .linked .button:checked:hover:backdrop,
3947 .primary-toolbar .linked .button:insensitive:backdrop,
3948 .menubar.toolbar .linked .entry:backdrop,
3949 .menubar.toolbar .linked .button:backdrop,
3950 .menubar.toolbar .linked .button:active:backdrop,
3951+.menubar.toolbar .linked .button:checked:backdrop,
3952 .menubar.toolbar .linked .button:active:hover:backdrop,
3953+.menubar.toolbar .linked .button:checked:hover:backdrop,
3954 .menubar.toolbar .linked .button:insensitive:backdrop,
3955 .header-bar .linked .entry:backdrop,
3956 .header-bar .linked .button:backdrop,
3957 .header-bar .linked .button:active:backdrop,
3958+.header-bar .linked .button:checked:backdrop,
3959 .header-bar .linked .button:active:hover:backdrop,
3960+.header-bar .linked .button:checked:hover:backdrop,
3961 .header-bar .linked .button:insensitive:backdrop {
3962 border-width: 1px;
3963 border-right-width: 0;
3964@@ -243,22 +262,30 @@
3965 .linked .entry:first-child:backdrop,
3966 .linked .button:first-child:backdrop,
3967 .linked .button:active:first-child:backdrop,
3968+.linked .button:checked:first-child:backdrop,
3969 .linked .button:active:hover:first-child:backdrop,
3970+.linked .button:checked:hover:first-child:backdrop,
3971 .linked .button:insensitive:first-child:backdrop,
3972 .primary-toolbar .linked .entry:first-child:backdrop,
3973 .primary-toolbar .linked .button:first-child:backdrop,
3974 .primary-toolbar .linked .button:active:first-child:backdrop,
3975+.primary-toolbar .linked .button:checked:first-child:backdrop,
3976 .primary-toolbar .linked .button:active:hover:first-child:backdrop,
3977+.primary-toolbar .linked .button:checked:hover:first-child:backdrop,
3978 .primary-toolbar .linked .button:insensitive:first-child:backdrop,
3979 .menubar.toolbar .linked .entry:first-child:backdrop,
3980 .menubar.toolbar .linked .button:first-child:backdrop,
3981 .menubar.toolbar .linked .button:active:first-child:backdrop,
3982+.menubar.toolbar .linked .button:checked:first-child:backdrop,
3983 .menubar.toolbar .linked .button:active:hover:first-child:backdrop,
3984+.menubar.toolbar .linked .button:checked:hover:first-child:backdrop,
3985 .menubar.toolbar .linked .button:insensitive:first-child:backdrop,
3986 .header-bar .linked .entry:first-child:backdrop,
3987 .header-bar .linked .button:first-child:backdrop,
3988 .header-bar .linked .button:active:first-child:backdrop,
3989+.header-bar .linked .button:checked:first-child:backdrop,
3990 .header-bar .linked .button:active:hover:first-child:backdrop,
3991+.header-bar .linked .button:checked:hover:first-child:backdrop,
3992 .header-bar .linked .button:insensitive:first-child:backdrop {
3993 border-width: 1px;
3994 border-right-width: 0;
3995@@ -274,22 +301,30 @@
3996 .linked .entry:last-child:backdrop,
3997 .linked .button:last-child:backdrop,
3998 .linked .button:active:last-child:backdrop,
3999+.linked .button:checked:last-child:backdrop,
4000 .linked .button:active:hover:last-child:backdrop,
4001+.linked .button:checked:hover:last-child:backdrop,
4002 .linked .button:insensitive:last-child:backdrop,
4003 .primary-toolbar .linked .entry:last-child:backdrop,
4004 .primary-toolbar .linked .button:last-child:backdrop,
4005 .primary-toolbar .linked .button:active:last-child:backdrop,
4006+.primary-toolbar .linked .button:checked:last-child:backdrop,
4007 .primary-toolbar .linked .button:active:hover:last-child:backdrop,
4008+.primary-toolbar .linked .button:checked:hover:last-child:backdrop,
4009 .primary-toolbar .linked .button:insensitive:last-child:backdrop,
4010 .menubar.toolbar .linked .entry:last-child:backdrop,
4011 .menubar.toolbar .linked .button:last-child:backdrop,
4012 .menubar.toolbar .linked .button:active:last-child:backdrop,
4013+.menubar.toolbar .linked .button:checked:last-child:backdrop,
4014 .menubar.toolbar .linked .button:active:hover:last-child:backdrop,
4015+.menubar.toolbar .linked .button:checked:hover:last-child:backdrop,
4016 .menubar.toolbar .linked .button:insensitive:last-child:backdrop,
4017 .header-bar .linked .entry:last-child:backdrop,
4018 .header-bar .linked .button:last-child:backdrop,
4019 .header-bar .linked .button:active:last-child:backdrop,
4020+.header-bar .linked .button:checked:last-child:backdrop,
4021 .header-bar .linked .button:active:hover:last-child:backdrop,
4022+.header-bar .linked .button:checked:hover:last-child:backdrop,
4023 .header-bar .linked .button:insensitive:last-child:backdrop {
4024 border-width: 1px;
4025
4026@@ -304,22 +339,30 @@
4027 .linked .entry:only-child:backdrop,
4028 .linked .button:only-child:backdrop,
4029 .linked .button:active:only-child:backdrop,
4030+.linked .button:checked:only-child:backdrop,
4031 .linked .button:active:hover:only-child:backdrop,
4032+.linked .button:checked:hover:only-child:backdrop,
4033 .linked .button:insensitive:only-child:backdrop,
4034 .primary-toolbar .linked .entry:only-child:backdrop,
4035 .primary-toolbar .linked .button:only-child:backdrop,
4036 .primary-toolbar .linked .button:active:only-child:backdrop,
4037+.primary-toolbar .linked .button:checked:only-child:backdrop,
4038 .primary-toolbar .linked .button:active:hover:only-child:backdrop,
4039+.primary-toolbar .linked .button:checked:hover:only-child:backdrop,
4040 .primary-toolbar .linked .button:insensitive:only-child:backdrop,
4041 .menubar.toolbar .linked .entry:only-child:backdrop,
4042 .menubar.toolbar .linked .button:only-child:backdrop,
4043 .menubar.toolbar .linked .button:active:only-child:backdrop,
4044+.menubar.toolbar .linked .button:checked:only-child:backdrop,
4045 .menubar.toolbar .linked .button:active:hover:only-child:backdrop,
4046+.menubar.toolbar .linked .button:checked:hover:only-child:backdrop,
4047 .menubar.toolbar .linked .button:insensitive:only-child:backdrop,
4048 .header-bar .linked .entry:only-child:backdrop,
4049 .header-bar .linked .button:only-child:backdrop,
4050 .header-bar .linked .button:active:only-child:backdrop,
4051+.header-bar .linked .button:checked:only-child:backdrop,
4052 .header-bar .linked .button:active:hover:only-child:backdrop,
4053+.header-bar .linked .button:checked:hover:only-child:backdrop,
4054 .header-bar .linked .button:insensitive:only-child:backdrop {
4055 border-width: 1px;
4056
4057@@ -386,13 +429,21 @@
4058
4059 /* FIXME (Cimi) this is horrible */
4060 .check:active:backdrop,
4061+.check:checked:backdrop,
4062 .check row:selected:active:backdrop,
4063+.check row:selected:checked:backdrop,
4064 .check row:selected:focused:active:backdrop,
4065+.check row:selected:focused:checked:backdrop,
4066 .notebook .check:active:backdrop,
4067+.notebook .check:checked:backdrop,
4068 .notebook .radio:active:backdrop,
4069+.notebook .radio:checked:backdrop,
4070 .radio:active:backdrop,
4071+.radio:checked:backdrop,
4072 .radio row:selected:active:backdrop,
4073+.radio row:selected:checked:backdrop,
4074 .radio row:selected:focused:active:backdrop,
4075+.radio row:selected:focused:checked:backdrop,
4076 .check:inconsistent:backdrop,
4077 .check row:selected:inconsistent:backdrop,
4078 .check row:selected:focused:inconsistent:backdrop,
4079@@ -422,21 +473,37 @@
4080
4081 /* FIXME (Cimi) this is horrible */
4082 .check:active:hover:backdrop,
4083+.check:checked:hover:backdrop,
4084 .check row:selected:active:hover:backdrop,
4085+.check row:selected:checked:hover:backdrop,
4086 .check row:selected:focused:active:hover:backdrop,
4087+.check row:selected:focused:checked:hover:backdrop,
4088 .notebook .check:active:hover:backdrop,
4089+.notebook .check:checked:hover:backdrop,
4090 .notebook .radio:active:hover:backdrop,
4091+.notebook .radio:checked:hover:backdrop,
4092 .radio:active:hover:backdrop,
4093+.radio:checked:hover:backdrop,
4094 .radio row:selected:active:hover:backdrop,
4095-.radio row:selected:focused:active:hover:backdrop
4096+.radio row:selected:checked:hover:backdrop,
4097+.radio row:selected:focused:active:hover:backdrop,
4098+.radio row:selected:focused:checked:hover:backdrop
4099 .check:active:hover:inconsistent:backdrop,
4100+.check:checked:hover:inconsistent:backdrop,
4101 .check row:selected:active:hover:inconsistent:backdrop,
4102+.check row:selected:checked:hover:inconsistent:backdrop,
4103 .check row:selected:focused:active:hover:inconsistent:backdrop,
4104+.check row:selected:focused:checked:hover:inconsistent:backdrop,
4105 .notebook .check:active:hover:inconsistent:backdrop,
4106+.notebook .check:checked:hover:inconsistent:backdrop,
4107 .notebook .radio:active:hover:inconsistent:backdrop,
4108+.notebook .radio:checked:hover:inconsistent:backdrop,
4109 .radio:active:hover:inconsistent:backdrop,
4110+.radio:checked:hover:inconsistent:backdrop,
4111 .radio row:selected:active:hover:inconsistent:backdrop,
4112-.radio row:selected:focused:active:hover:inconsistent:backdrop {
4113+.radio row:selected:checked:hover:inconsistent:backdrop,
4114+.radio row:selected:focused:active:hover:inconsistent:backdrop,
4115+.radio row:selected:focused:checked:hover:inconsistent:backdrop {
4116 background-image: -gtk-gradient (linear, left top, left bottom,
4117 from (shade (@backdrop_selected_bg_color, 1.1)),
4118 to (shade (@backdrop_selected_bg_color, 0.98)));
4119@@ -463,7 +530,9 @@
4120 }
4121
4122 .check:insensitive:active:backdrop,
4123+.check:insensitive:checked:backdrop,
4124 .radio:insensitive:active:backdrop,
4125+.radio:insensitive:checked:backdrop,
4126 .check:insensitive:inconsistent:backdrop,
4127 .radio:insensitive:inconsistent:backdrop {
4128 background-image: -gtk-gradient (linear, left top, left bottom,
4129@@ -486,8 +555,10 @@
4130 *****************/
4131 column-header .button:backdrop,
4132 column-header .button:active:backdrop,
4133+column-header .button:checked:backdrop,
4134 .notebook column-header .button:backdrop,
4135-.notebook column-header .button:active:backdrop {
4136+.notebook column-header .button:active:backdrop,
4137+.notebook column-header .button:checked:backdrop {
4138 border-radius: 0;
4139 border-width: 0 1px 1px 0;
4140
4141@@ -536,6 +607,7 @@
4142 GtkComboBox.combobox-entry .button:backdrop,
4143 GtkComboBox.combobox-entry .button:hover:backdrop,
4144 GtkComboBox.combobox-entry .button:active:backdrop,
4145+GtkComboBox.combobox-entry .button:checked:backdrop,
4146 GtkComboBox.combobox-entry .button:insensitive:backdrop {
4147 border-top-color: shade (@bg_color, 0.64);
4148 border-right-color: shade (@bg_color, 0.8);
4149@@ -892,7 +964,8 @@
4150 to (shade (@bg_color, 0.92)));
4151 }
4152
4153-GtkSwitch.trough:active:backdrop {
4154+GtkSwitch.trough:active:backdrop,
4155+GtkSwitch.trough:checked:backdrop {
4156 background-image: -gtk-gradient (linear, left top, left bottom,
4157 from (shade (@backdrop_selected_bg_color, 0.93)),
4158 to (shade (@backdrop_selected_bg_color, 0.99)));
4159@@ -1029,16 +1102,19 @@
4160 .primary-toolbar .raised.button:backdrop,
4161 .primary-toolbar .button:hover:backdrop,
4162 .primary-toolbar .button:active:backdrop,
4163+.primary-toolbar .button:checked:backdrop,
4164 .primary-toolbar .button:insensitive:backdrop,
4165 .menubar.toolbar .raised .button:backdrop,
4166 .menubar.toolbar .raised.button:backdrop,
4167 .menubar.toolbar .button:hover:backdrop,
4168 .menubar.toolbar .button:active:backdrop,
4169+.menubar.toolbar .button:checked:backdrop,
4170 .menubar.toolbar .button:insensitive:backdrop,
4171 .header-bar .raised .button:backdrop,
4172 .header-bar .raised.button:backdrop,
4173 .header-bar .button:hover:backdrop,
4174 .header-bar .button:active:backdrop,
4175+.header-bar .button:checked:backdrop,
4176 .header-bar .button:insensitive:backdrop {
4177 border-width: 1px;
4178
4179@@ -1092,8 +1168,11 @@
4180 }
4181
4182 .primary-toolbar .button:active:backdrop,
4183+.primary-toolbar .button:checked:backdrop,
4184 .menubar.toolbar .button:active:backdrop,
4185-.header-bar .button:active:backdrop {
4186+.menubar.toolbar .button:checked:backdrop,
4187+.header-bar .button:active:backdrop,
4188+.header-bar .button:checked:backdrop {
4189 background-image: -gtk-gradient (linear, left top, left bottom,
4190 from (shade (@dark_bg_color, 0.9)),
4191 to (shade (@dark_bg_color, 0.95)));
4192@@ -1109,8 +1188,11 @@
4193 }
4194
4195 .primary-toolbar .button:active:hover:backdrop,
4196+.primary-toolbar .button:checked:hover:backdrop,
4197 .menubar.toolbar .button:active:hover:backdrop,
4198-.header-bar .button:active:hover:backdrop {
4199+.menubar.toolbar .button:checked:hover:backdrop,
4200+.header-bar .button:active:hover:backdrop,
4201+.header-bar .button:checked:hover:backdrop {
4202 background-image: -gtk-gradient (linear, left top, left bottom,
4203 from (shade (@dark_bg_color, 0.95)),
4204 to (shade (@dark_bg_color, 1.0)));
4205@@ -1124,10 +1206,13 @@
4206 }
4207
4208 .primary-toolbar .button:active:insensitive:backdrop,
4209+.primary-toolbar .button:checked:insensitive:backdrop,
4210 .primary-toolbar .button:insensitive:backdrop,
4211 .menubar.toolbar .button:active:insensitive:backdrop,
4212+.menubar.toolbar .button:checked:insensitive:backdrop,
4213 .menubar.toolbar .button:insensitive:backdrop,
4214 .header-bar .button:active:insensitive:backdrop,
4215+.header-bar .button:checked:insensitive:backdrop,
4216 .header-bar .button:insensitive:backdrop {
4217 text-shadow: none;
4218
4219@@ -1153,8 +1238,11 @@
4220 }
4221
4222 .primary-toolbar .button:active:insensitive:backdrop,
4223+.primary-toolbar .button:checked:insensitive:backdrop,
4224 .menubar.toolbar .button:active:insensitive:backdrop,
4225-.header-bar .button:active:insensitive:backdrop {
4226+.menubar.toolbar .button:checked:insensitive:backdrop,
4227+.header-bar .button:active:insensitive:backdrop,
4228+.header-bar .button:checked:insensitive:backdrop {
4229 background-image: -gtk-gradient (linear, left top, left bottom,
4230 from (shade (@dark_bg_color, 0.94)),
4231 to (shade (@dark_bg_color, 1.02)));
4232@@ -1166,12 +1254,15 @@
4233
4234 .primary-toolbar .entry:backdrop,
4235 .primary-toolbar .entry:active:backdrop,
4236+.primary-toolbar .entry:checked:backdrop,
4237 .primary-toolbar .entry:focused:backdrop,
4238 .menubar.toolbar .entry:backdrop,
4239 .menubar.toolbar .entry:active:backdrop,
4240+.menubar.toolbar .entry:checked:backdrop,
4241 .menubar.toolbar .entry:focused:backdrop,
4242 .header-bar .entry:backdrop,
4243 .header-bar .entry:active:backdrop,
4244+.header-bar .entry:checked:backdrop,
4245 .header-bar .entry:focused:backdrop {
4246 border-radius: 3px;
4247
4248@@ -1272,8 +1363,10 @@
4249 }
4250
4251 .inline-toolbar.toolbar .button *:active:backdrop,
4252+.inline-toolbar.toolbar .button *:checked:backdrop,
4253 .inline-toolbar.toolbar .button *:insensitive:backdrop,
4254 .inline-toolbar.toolbar GtkToolButton .button:active:backdrop,
4255+.inline-toolbar.toolbar GtkToolButton .button:checked:backdrop,
4256 .inline-toolbar.toolbar GtkToolButton .button:insensitive:backdrop {
4257 -unico-outer-stroke-width: 1px 0 1px 0;
4258 -unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
4259
4260=== modified file 'Radiance/gtk-3.0/gtk-widgets-borders-radiance.css'
4261--- Radiance/gtk-3.0/gtk-widgets-borders-radiance.css 2014-01-20 19:19:40 +0000
4262+++ Radiance/gtk-3.0/gtk-widgets-borders-radiance.css 2014-10-21 15:21:37 +0000
4263@@ -11,14 +11,20 @@
4264 }
4265
4266 .primary-toolbar .button:active,
4267+.primary-toolbar .button:checked,
4268 .menubar.toolbar .button:active,
4269-.header-bar .button:active {
4270+.menubar.toolbar .button:checked,
4271+.header-bar .button:active,
4272+.header-bar .button:checked {
4273 border-image: url("assets/radiance-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
4274 }
4275
4276 .primary-toolbar .button:active:focused,
4277+.primary-toolbar .button:checked:focused,
4278 .menubar.toolbar .button:active:focused,
4279-.header-bar .button:active:focused {
4280+.menubar.toolbar .button:checked:focused,
4281+.header-bar .button:active:focused,
4282+.header-bar .button:checked:focused {
4283 border-image: url("assets/radiance-button-toolbar-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
4284 }
4285
4286@@ -29,8 +35,11 @@
4287 }
4288
4289 .primary-toolbar .button:active:backdrop,
4290+.primary-toolbar .button:checked:backdrop,
4291 .menubar.toolbar .button:active:backdrop,
4292-.header-bar .button:active:backdrop {
4293+.menubar.toolbar .button:checked:backdrop,
4294+.header-bar .button:active:backdrop,
4295+.header-bar .button:checked:backdrop {
4296 border-image: url("assets/radiance-backdrop-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
4297 }
4298
4299@@ -62,8 +71,11 @@
4300 }
4301
4302 .primary-toolbar GtkComboBox.combobox-entry .button:focus:active:focus,
4303+.primary-toolbar GtkComboBox.combobox-entry .button:focus:checked:focus,
4304 .menubar.toolbar GtkComboBox.combobox-entry .button:focus:active:focus,
4305-.header-bar GtkComboBox.combobox-entry .button:focus:active:focus {
4306+.menubar.toolbar GtkComboBox.combobox-entry .button:focus:checked:focus,
4307+.header-bar GtkComboBox.combobox-entry .button:focus:active:focus,
4308+.header-bar GtkComboBox.combobox-entry .button:focus:checked:focus {
4309 border-image: url("assets/radiance-combobox-button-toolbar-pressed-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
4310 }
4311
4312
4313=== modified file 'Radiance/gtk-3.0/gtk-widgets-borders.css'
4314--- Radiance/gtk-3.0/gtk-widgets-borders.css 2014-01-20 19:19:40 +0000
4315+++ Radiance/gtk-3.0/gtk-widgets-borders.css 2014-10-21 15:21:37 +0000
4316@@ -11,8 +11,11 @@
4317 .entry:focus,
4318 GtkComboBox.combobox-entry .entry:focus,
4319 .button:focus:active,
4320+.button:focus:checked,
4321 .button.default:active,
4322-GtkSwitch.trough:active {
4323+.button.default:checked,
4324+GtkSwitch.trough:active,
4325+GtkSwitch.trough:checked {
4326 }
4327
4328 /**********
4329@@ -57,35 +60,43 @@
4330 border-image: url("assets/backdrop-button-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
4331 }
4332
4333-.button:active {
4334+.button:active,
4335+.button:checked {
4336 border-image: url("assets/button-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
4337 }
4338
4339-.button:active:backdrop {
4340+.button:active:backdrop,
4341+.button:checked:backdrop {
4342 border-image: url("assets/backdrop-button-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
4343 }
4344
4345-.button:active:hover {
4346+.button:active:hover,
4347+.button:checked:hover {
4348 border-image: url("assets/button-active-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
4349 }
4350
4351-.button:active:hover:backdrop {
4352+.button:active:hover:backdrop,
4353+.button:checked:hover:backdrop {
4354 border-image: url("assets/backdrop-button-active-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
4355 }
4356
4357-.button:active:focus {
4358+.button:active:focus,
4359+.button:checked:focus {
4360 border-image: url("assets/button-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
4361 }
4362
4363-.button:active:hover:focus {
4364+.button:active:hover:focus,
4365+.button:checked:hover:focus {
4366 border-image: url("assets/button-active-focused-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
4367 }
4368
4369-.button:active:insensitive {
4370+.button:active:insensitive,
4371+.button:checked:insensitive {
4372 border-image: url("assets/button-active-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
4373 }
4374
4375-.button:active:insensitive:backdrop {
4376+.button:active:insensitive:backdrop,
4377+.button:checked:insensitive:backdrop {
4378 border-image: url("assets/backdrop-button-active-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
4379 }
4380
4381@@ -112,7 +123,10 @@
4382
4383 .primary-toolbar .button,
4384 .menubar.toolbar .button,
4385-.header-bar .button {
4386+.header-bar .button,
4387+.primary-toolbar .button.flat:hover,
4388+.menubar.toolbar .button.flat:hover,
4389+.header-bar .button.flat:hover {
4390 border-image: url("assets/button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
4391 }
4392
4393@@ -123,14 +137,20 @@
4394 }
4395
4396 .primary-toolbar .button:active,
4397+.primary-toolbar .button:checked,
4398 .menubar.toolbar .button:active,
4399-.header-bar .button:active {
4400+.menubar.toolbar .button:checked,
4401+.header-bar .button:active,
4402+.header-bar .button:checked {
4403 border-image: url("assets/button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
4404 }
4405
4406 .primary-toolbar .button:active:focused,
4407+.primary-toolbar .button:checked:focused,
4408 .menubar.toolbar .button:active:focused,
4409-.header-bar .button:active:focused {
4410+.menubar.toolbar .button:checked:focused,
4411+.header-bar .button:active:focused,
4412+.header-bar .button:checked:focused {
4413 border-image: url("assets/button-toolbar-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
4414 }
4415
4416@@ -141,11 +161,21 @@
4417 }
4418
4419 .primary-toolbar .button:active:backdrop,
4420+.primary-toolbar .button:checked:backdrop,
4421 .menubar.toolbar .button:active:backdrop,
4422-.header-bar .button:active:backdrop {
4423+.menubar.toolbar .button:checked:backdrop,
4424+.header-bar .button:active:backdrop,
4425+.header-bar .button:checked:backdrop {
4426 border-image: url("assets/backdrop-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
4427 }
4428
4429+.button.flat,
4430+.button.flat:backdrop,
4431+GtkLinkButton.button.flat:hover,
4432+GtkLinkButton.button.flat:active:hover {
4433+ border-image: none;
4434+}
4435+
4436 .menubar.menuitem:hover,
4437 .menubar .menuitem:hover {
4438 border: 1px solid #2e2e2c;
4439@@ -243,7 +273,8 @@
4440 border-image: url("assets/backdrop-combobox-button-disabled.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
4441 }
4442
4443-GtkComboBox.combobox-entry .button:active:focus {
4444+GtkComboBox.combobox-entry .button:active:focus,
4445+GtkComboBox.combobox-entry .button:checked:focus {
4446 border-image: url("assets/combobox-button-pressed-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
4447 }
4448
4449@@ -263,8 +294,11 @@
4450 }
4451
4452 .primary-toolbar GtkComboBox.combobox-entry .button:focus:active:focus,
4453+.primary-toolbar GtkComboBox.combobox-entry .button:focus:checked:focus,
4454 .menubar.toolbar GtkComboBox.combobox-entry .button:focus:active:focus,
4455-.header-bar GtkComboBox.combobox-entry .button:focus:active:focus {
4456+.menubar.toolbar GtkComboBox.combobox-entry .button:focus:checked:focus,
4457+.header-bar GtkComboBox.combobox-entry .button:focus:active:focus,
4458+.header-bar GtkComboBox.combobox-entry .button:focus:checked:focus {
4459 border-image: url("assets/combobox-button-toolbar-pressed-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
4460 }
4461
4462@@ -290,19 +324,23 @@
4463 border-left-width: 0;
4464 }
4465
4466-.notebook tab.top:active {
4467+.notebook tab.top:active,
4468+.notebook tab.top:checked {
4469 border-image: url("assets/notebook-tab-top.png") 8 10 1 10 / 8px 10px 1px 10px stretch;
4470 }
4471
4472-.notebook tab.right:active {
4473+.notebook tab.right:active,
4474+.notebook tab.right:checked {
4475 border-image: url("assets/notebook-tab-right.png") 10 8 10 1 / 10px 8px 10px 1px stretch;
4476 }
4477
4478-.notebook tab.bottom:active {
4479+.notebook tab.bottom:active,
4480+.notebook tab.bottom:checked {
4481 border-image: url("assets/notebook-tab-bottom.png") 1 10 8 10 / 1px 10px 8px 10px stretch;
4482 }
4483
4484-.notebook tab.left:active {
4485+.notebook tab.left:active,
4486+.notebook tab.left:checked {
4487 border-image: url("assets/notebook-tab-left.png") 10 1 10 8 / 10px 1px 10px 8px stretch;
4488 }
4489
4490@@ -342,7 +380,8 @@
4491 border-image: url("assets/switch-trough-off.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
4492 }
4493
4494-GtkSwitch.trough:active {
4495+GtkSwitch.trough:active,
4496+GtkSwitch.trough:checked {
4497 border-image: url("assets/switch-trough-on.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
4498 }
4499
4500@@ -353,16 +392,21 @@
4501 }
4502
4503 .primary-toolbar GtkSwitch.trough:active,
4504+.primary-toolbar GtkSwitch.trough:checked,
4505 .menubar.toolbar GtkSwitch.trough:active,
4506-.header-bar GtkSwitch.trough:active {
4507+.menubar.toolbar GtkSwitch.trough:checked,
4508+.header-bar GtkSwitch.trough:active,
4509+.header-bar GtkSwitch.trough:checked {
4510 border-image: url("assets/switch-trough-toolbar-on.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
4511 }
4512
4513 /* XXX temporary */
4514 GtkSwitch.trough:backdrop,
4515 GtkSwitch.trough:active:backdrop,
4516+GtkSwitch.trough:checked:backdrop,
4517 GtkSwitch.trough:insensitive,
4518-GtkSwitch.trough:active:insensitive {
4519+GtkSwitch.trough:active:insensitive,
4520+GtkSwitch.trough:checked:insensitive {
4521 border-image: url("assets/switch-trough-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
4522 }
4523
4524@@ -370,7 +414,8 @@
4525 border-image: url("assets/switch-button-off.png") 9 11 9 11 / 9px 11px 9px 11px stretch;
4526 }
4527
4528-GtkSwitch.slider:active {
4529+GtkSwitch.slider:active,
4530+GtkSwitch.slider:checked {
4531 border-image: url("assets/switch-button-on.png") 9 11 9 11 / 9px 11px 9px 11px stretch;
4532 }
4533
4534@@ -382,7 +427,9 @@
4535
4536 /* XXX temporary */
4537 GtkSwitch.slider:active:backdrop,
4538-GtkSwitch.slider:active:insensitive {
4539+GtkSwitch.slider:checked:backdrop,
4540+GtkSwitch.slider:active:insensitive,
4541+GtkSwitch.slider:checked:insensitive {
4542 border-image: url("assets/switch-button-on-disabled.png") 9 11 9 11 / 9px 11px 9px 11px stretch;
4543 }
4544
4545
4546=== modified file 'Radiance/gtk-3.0/gtk-widgets-radiance.css'
4547--- Radiance/gtk-3.0/gtk-widgets-radiance.css 2014-03-24 15:47:08 +0000
4548+++ Radiance/gtk-3.0/gtk-widgets-radiance.css 2014-10-21 15:21:37 +0000
4549@@ -37,14 +37,23 @@
4550 }
4551
4552 .primary-toolbar .linked .button:active,
4553+.primary-toolbar .linked .button:checked,
4554 .primary-toolbar .button.raised.linked:active,
4555+.primary-toolbar .button.raised.linked:checked,
4556 .primary-toolbar .raised.linked .button:active,
4557+.primary-toolbar .raised.linked .button:checked,
4558 .menubar.toolbar .linked .button:active,
4559+.menubar.toolbar .linked .button:checked,
4560 .menubar.toolbar .button.raised.linked:active,
4561+.menubar.toolbar .button.raised.linked:checked,
4562 .menubar.toolbar .raised.linked .button:active,
4563+.menubar.toolbar .raised.linked .button:checked,
4564 .header-bar .linked .button:active,
4565+.header-bar .linked .button:checked,
4566 .header-bar .button.raised.linked:active,
4567-.header-bar .raised.linked .button:active {
4568+.header-bar .button.raised.linked:checked,
4569+.header-bar .raised.linked .button:active,
4570+.header-bar .raised.linked .button:checked {
4571 box-shadow: inset 1px 0 shade (@dark_bg_color, 0.9);
4572 }
4573
4574@@ -138,16 +147,19 @@
4575 .primary-toolbar .raised.button,
4576 .primary-toolbar .button:hover,
4577 .primary-toolbar .button:active,
4578+.primary-toolbar .button:checked,
4579 .primary-toolbar .button:insensitive,
4580 .menubar.toolbar .raised .button,
4581 .menubar.toolbar .raised.button,
4582 .menubar.toolbar .button:hover,
4583 .menubar.toolbar .button:active,
4584+.menubar.toolbar .button:checked,
4585 .menubar.toolbar .button:insensitive,
4586 .header-bar .raised .button,
4587 .header-bar .raised.button,
4588 .header-bar .button:hover,
4589 .header-bar .button:active,
4590+.header-bar .button:checked,
4591 .header-bar .button:insensitive {
4592 background-image: -gtk-gradient (linear, left top, left bottom,
4593 from (shade (@dark_bg_color, 1.03)),
4594
4595=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
4596--- Radiance/gtk-3.0/gtk-widgets.css 2014-10-13 14:58:41 +0000
4597+++ Radiance/gtk-3.0/gtk-widgets.css 2014-10-21 15:21:37 +0000
4598@@ -142,6 +142,7 @@
4599
4600 color: @fg_color;
4601 text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4);
4602+ transition: all 150ms ease-out;
4603 }
4604
4605 GtkSwitch.slider:backdrop,
4606@@ -158,6 +159,7 @@
4607 from (shade (@button_bg_color, 1.12)),
4608 color-stop (0.5, @button_bg_color),
4609 to (shade (@button_bg_color, 0.96)));
4610+ transition: all 200ms ease-out;
4611 }
4612
4613 .button:hover:backdrop {
4614@@ -179,30 +181,81 @@
4615 text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.2);
4616 }
4617
4618-.button:active {
4619+.button:checked,
4620+.button:active,
4621+.button:checked {
4622 background-image: -gtk-gradient (linear, left top, left bottom,
4623 from (#cecece),
4624 to (#e8e8e8));
4625+ transition: all 150ms ease-out;
4626 }
4627
4628-.button:active:hover {
4629+.button:active:hover,
4630+.button:checked:hover {
4631 background-image: -gtk-gradient (linear, left top, left bottom,
4632 from (#dcdcdc),
4633 to (#f3f3f3));
4634 }
4635
4636-.button:active:insensitive {
4637+.button:active:insensitive,
4638+.button:checked:insensitive {
4639 background-image: -gtk-gradient (linear, left top, left bottom,
4640 from (#e3e3e3),
4641 to (#f3f3f3));
4642 }
4643
4644-.button:active:insensitive:backdrop {
4645+.button:active:insensitive:backdrop,
4646+.button:checked:insensitive:backdrop {
4647 background-image: -gtk-gradient (linear, left top, left bottom,
4648 from (mix (#e3e3e3, @bg_color, 0.5)),
4649 to (mix (#f3f3f3, @bg_color, 0.5)));
4650 }
4651
4652+.button.flat,
4653+.button.flat:backdrop,
4654+GtkLinkButton.button:hover,
4655+GtkLinkButton.button:active:hover {
4656+ background-image: none;
4657+ background: none;
4658+}
4659+
4660+GtkLinkButton.button {
4661+ color: @selected_bg_color;
4662+}
4663+
4664+/* disable .button style from GtkListBox rows*/
4665+
4666+.button.list-row,
4667+.button.list-row:active,
4668+.button.list-row:checked {
4669+ background: transparent;
4670+ background-image: none;
4671+ text-shadow: none;
4672+}
4673+.button.list-row,
4674+.button.list-row:hover,
4675+.button.list-row:active:hover,
4676+.button.list-row:checked:hover {
4677+ border: none;
4678+ border-radius: 0;
4679+ background-color: @bg_color;
4680+}
4681+.button.list-row:selected,
4682+.button.list-row:selected:hover {
4683+ background-color: alpha (@selected_bg_color, 0.9);
4684+ color: @selected_fg_color;
4685+ text-shadow: 0 1px shade (@selected_bg_color, 0.8);
4686+}
4687+.button.list-row:selected:backdrop,
4688+.button.list-row:selected:hover:backdrop {
4689+ background-image: -gtk-gradient (linear, left top, left bottom,
4690+ from (shade (shade (@bg_color, 0.95), 0.94)),
4691+ to (shade (shade (@bg_color, 0.95), 0.86)));
4692+ border-top-color: shade (shade (@bg_color, 0.95), 0.88);
4693+ color: @fg_color;
4694+ text-shadow: 0 1px shade (shade (@bg_color, 0.95), 0.96);
4695+}
4696+
4697 /* default button */
4698
4699 /*
4700@@ -220,13 +273,15 @@
4701 to (mix (shade (@selected_bg_color, 0.89), @bg_color, 0.3)));
4702 }
4703
4704-.button.default:active {
4705+.button.default:active,
4706+.button.default:checked {
4707 background-image: -gtk-gradient (linear, left top, left bottom,
4708 from (mix (shade (@selected_bg_color, 0.95), @bg_color, 0.3)),
4709 to (mix (shade (@selected_bg_color, 1.05), @bg_color, 0.3)));
4710 }
4711
4712-.button.default:active:hover {
4713+.button.default:active:hover,
4714+.button.default:checked:hover {
4715 background-image: -gtk-gradient (linear, left top, left bottom,
4716 from (mix (shade (@selected_bg_color, 1.0), @bg_color, 0.3)),
4717 to (mix (shade (@selected_bg_color, 1.1), @bg_color, 0.3)));
4718@@ -262,10 +317,15 @@
4719 }
4720
4721 .linked .button:active,
4722+.linked .button:checked,
4723 .toolbar .button.raised.linked:active,
4724+.toolbar .button.raised.linked:checked,
4725 .toolbar .raised.linked .button:active,
4726+.toolbar .raised.linked .button:checked,
4727 .inline-toolbar.toolbar .button:active,
4728-.inline-toolbar.toolbar GtkToolButton .button:active {
4729+.inline-toolbar.toolbar .button:checked,
4730+.inline-toolbar.toolbar GtkToolButton .button:active,
4731+.inline-toolbar.toolbar GtkToolButton .button:checked {
4732 /*box-shadow: inset 1px 0 shade (@bg_color, 0.76);*/
4733 }
4734
4735@@ -295,18 +355,36 @@
4736
4737
4738 /* Middle button */
4739-.linked .entry,
4740-.linked .entry:active,
4741-.linked .entry:focus,
4742-.linked .entry:focus:active,
4743-.linked .button,
4744-.linked .button:active,
4745-.linked .button:active:hover,
4746-.linked .button:focus,
4747-.linked .button:focus:active,
4748-.linked .button:insensitive,
4749-.linked .button:backdrop,
4750-.linked .button:active:backdrop {
4751+.linked > .entry,
4752+.linked > .entry:active,
4753+.linked > .entry:checked,
4754+.linked > .entry:focus,
4755+.linked > .entry:focus:active,
4756+.linked > .entry:focus:checked,
4757+.linked > .button,
4758+.linked > .button:active,
4759+.linked > .button:checked,
4760+.linked > .button:active:hover,
4761+.linked > .button:checked:hover,
4762+.linked > .button:focus,
4763+.linked > .button:focus:active,
4764+.linked > .button:focus:checked,
4765+.linked > .button:insensitive,
4766+.linked > .button:backdrop,
4767+.linked > .button:active:backdrop,
4768+.linked > .button:checked:backdrop,
4769+.linked > GtkComboBox > .button,
4770+.linked > GtkComboBox > .button:active,
4771+.linked > GtkComboBox > .button:checked,
4772+.linked > GtkComboBox > .button:active:hover,
4773+.linked > GtkComboBox > .button:checked:hover,
4774+.linked > GtkComboBox > .button:focus,
4775+.linked > GtkComboBox > .button:focus:active,
4776+.linked > GtkComboBox > .button:focus:checked,
4777+.linked > GtkComboBox > .button:insensitive,
4778+.linked > GtkComboBox > .button:backdrop,
4779+.linked > GtkComboBox > .button:active:backdrop,
4780+.linked > GtkComboBox > .button:checked:backdrop {
4781 border-right-width: 0;
4782 border-left-width: 0;
4783 border-image-width: 10px 0 10px 0;
4784@@ -314,18 +392,36 @@
4785 }
4786
4787 /* Leftmost button */
4788-.linked .entry:first-child,
4789-.linked .entry:active:first-child,
4790-.linked .entry:focus:first-child,
4791-.linked .entry:focus:active:first-child,
4792-.linked .button:first-child,
4793-.linked .button:active:first-child,
4794-.linked .button:active:hover:first-child,
4795-.linked .button:focus:first-child,
4796-.linked .button:focus:active:first-child,
4797-.linked .button:insensitive:first-child,
4798-.linked .button:backdrop:first-child,
4799-.linked .button:active:backdrop:first-child {
4800+.linked > .entry:first-child,
4801+.linked > .entry:active:first-child,
4802+.linked > .entry:checked:first-child,
4803+.linked > .entry:focus:first-child,
4804+.linked > .entry:focus:active:first-child,
4805+.linked > .entry:focus:checked:first-child,
4806+.linked > .button:first-child,
4807+.linked > .button:active:first-child,
4808+.linked > .button:checked:first-child,
4809+.linked > .button:active:hover:first-child,
4810+.linked > .button:checked:hover:first-child,
4811+.linked > .button:focus:first-child,
4812+.linked > .button:focus:active:first-child,
4813+.linked > .button:focus:checked:first-child,
4814+.linked > .button:insensitive:first-child,
4815+.linked > .button:backdrop:first-child,
4816+.linked > .button:active:backdrop:first-child,
4817+.linked > .button:checked:backdrop:first-child,
4818+.linked > GtkComboBox:first-child > .button,
4819+.linked > GtkComboBox:first-child > .button:active,
4820+.linked > GtkComboBox:first-child > .button:checked,
4821+.linked > GtkComboBox:first-child > .button:active:hover,
4822+.linked > GtkComboBox:first-child > .button:checked:hover,
4823+.linked > GtkComboBox:first-child > .button:focus,
4824+.linked > GtkComboBox:first-child > .button:focus:active,
4825+.linked > GtkComboBox:first-child > .button:focus:checked,
4826+.linked > GtkComboBox:first-child > .button:insensitive,
4827+.linked > GtkComboBox:first-child > .button:backdrop,
4828+.linked > GtkComboBox:first-child > .button:active:backdrop,
4829+.linked > GtkComboBox:first-child > .button:checked:backdrop {
4830 border-width: 1px;
4831 border-right-width: 0;
4832 border-image-width: 10px 0 10px 12px;
4833@@ -335,18 +431,36 @@
4834 }
4835
4836 /* Rightmost button */
4837-.linked .entry:last-child,
4838-.linked .entry:active:last-child,
4839-.linked .entry:focus:last-child,
4840-.linked .entry:focus:active:last-child,
4841-.linked .button:last-child,
4842-.linked .button:active:last-child,
4843-.linked .button:active:hover:last-child,
4844-.linked .button:focus:last-child,
4845-.linked .button:focus:active:last-child,
4846-.linked .button:insensitive:last-child,
4847-.linked .button:backdrop:last-child,
4848-.linked .button:active:backdrop:last-child {
4849+.linked > .entry:last-child,
4850+.linked > .entry:active:last-child,
4851+.linked > .entry:checked:last-child,
4852+.linked > .entry:focus:last-child,
4853+.linked > .entry:focus:active:last-child,
4854+.linked > .entry:focus:checked:last-child,
4855+.linked > .button:last-child,
4856+.linked > .button:active:last-child,
4857+.linked > .button:checked:last-child,
4858+.linked > .button:active:hover:last-child,
4859+.linked > .button:checked:hover:last-child,
4860+.linked > .button:focus:last-child,
4861+.linked > .button:focus:active:last-child,
4862+.linked > .button:focus:checked:last-child,
4863+.linked > .button:insensitive:last-child,
4864+.linked > .button:backdrop:last-child,
4865+.linked > .button:active:backdrop:last-child,
4866+.linked > .button:checked:backdrop:last-child,
4867+.linked > GtkComboBox:last-child > .button,
4868+.linked > GtkComboBox:last-child > .button:active,
4869+.linked > GtkComboBox:last-child > .button:checked,
4870+.linked > GtkComboBox:last-child > .button:active:hover,
4871+.linked > GtkComboBox:last-child > .button:checked:hover,
4872+.linked > GtkComboBox:last-child > .button:focus,
4873+.linked > GtkComboBox:last-child > .button:focus:active,
4874+.linked > GtkComboBox:last-child > .button:focus:checked,
4875+.linked > GtkComboBox:last-child > .button:insensitive,
4876+.linked > GtkComboBox:last-child > .button:backdrop,
4877+.linked > GtkComboBox:last-child > .button:active:backdrop,
4878+.linked > GtkComboBox:last-child > .button:checked:backdrop {
4879 border-width: 1px;
4880 border-left-width: 0;
4881 border-image-width: 10px 12px 10px 0;
4882@@ -356,18 +470,88 @@
4883 }
4884
4885 /* Linked single button */
4886-.linked .entry:only-child,
4887-.linked .entry:active:only-child,
4888-.linked .entry:focus:only-child,
4889-.linked .entry:focus:active:only-child,
4890-.linked .button:only-child,
4891-.linked .button:active:only-child,
4892-.linked .button:active:hover:only-child,
4893-.linked .button:focus:only-child,
4894-.linked .button:focus:active:only-child,
4895-.linked .button:insensitive:only-child,
4896-.linked .button:backdrop:only-child,
4897-.linked .button:active:backdrop:only-child {
4898+.linked > .entry:only-child,
4899+.linked > .entry:active:only-child,
4900+.linked > .entry:checked:only-child,
4901+.linked > .entry:focus:only-child,
4902+.linked > .entry:focus:active:only-child,
4903+.linked > .entry:focus:checked:only-child,
4904+.linked > .button:only-child,
4905+.linked > .button:active:only-child,
4906+.linked > .button:checked:only-child,
4907+.linked > .button:active:hover:only-child,
4908+.linked > .button:checked:hover:only-child,
4909+.linked > .button:focus:only-child,
4910+.linked > .button:focus:active:only-child,
4911+.linked > .button:focus:checked:only-child,
4912+.linked > .button:insensitive:only-child,
4913+.linked > .button:backdrop:only-child,
4914+.linked > .button:active:backdrop:only-child,
4915+.linked > .button:checked:backdrop:only-child,
4916+.linked > GtkComboBox:only-child > .button,
4917+.linked > GtkComboBox:only-child > .button:active,
4918+.linked > GtkComboBox:only-child > .button:checked,
4919+.linked > GtkComboBox:only-child > .button:active:hover,
4920+.linked > GtkComboBox:only-child > .button:checked:hover,
4921+.linked > GtkComboBox:only-child > .button:focus,
4922+.linked > GtkComboBox:only-child > .button:focus:active,
4923+.linked > GtkComboBox:only-child > .button:focus:checked,
4924+.linked > GtkComboBox:only-child > .button:insensitive,
4925+.linked > GtkComboBox:only-child > .button:backdrop,
4926+.linked > GtkComboBox:only-child > .button:active:backdrop,
4927+.linked > GtkComboBox:only-child > .button:checked:backdrop {
4928+ border-right-width: 1px;
4929+ border-left-width: 1px;
4930+ border-image-width: 10px 12px 10px 12px;
4931+ border-radius: 8px;
4932+}
4933+
4934+/* Middle button (vertical) */
4935+.linked.vertical .entry,
4936+.linked.vertical .button,
4937+.linked.vertical .button:active,
4938+.linked.vertical .button:active:hover,
4939+.linked.vertical .button:insensitive {
4940+ border-right-width: 0;
4941+ border-left-width: 0;
4942+ border-image-width: 0px 12px 0px 12px;
4943+ border-radius: 0;
4944+}
4945+
4946+/* Top button (vertical) */
4947+.linked.vertical .entry:first-child,
4948+.linked.vertical .button:first-child,
4949+.linked.vertical .button:active:first-child,
4950+.linked.vertical .button:active:hover:first-child,
4951+.linked.vertical .button:insensitive:first-child {
4952+ border-width: 1px;
4953+ border-bottom-width: 0;
4954+ border-image-width: 10px 12px 0px 12px;
4955+ border-radius: 8px;
4956+ border-bottom-left-radius: 0;
4957+ border-bottom-right-radius: 0;
4958+}
4959+
4960+/* Bottom button (vertical) */
4961+.linked.vertical .entry:last-child,
4962+.linked.vertical .button:last-child,
4963+.linked.vertical .button:active:last-child,
4964+.linked.vertical .button:active:hover:last-child,
4965+.linked.vertical .button:insensitive:last-child {
4966+ border-width: 1px;
4967+ border-bottom-width: 0;
4968+ border-image-width: 0px 12px 10px 12px;
4969+ border-radius: 8px;
4970+ border-top-left-radius: 0;
4971+ border-top-right-radius: 0;
4972+}
4973+
4974+/* Linked single button (vertical) */
4975+.linked.vertical .entry:only-child,
4976+.linked.vertical .button:only-child,
4977+.linked.vertical .button:active:only-child,
4978+.linked.vertical .button:active:hover:only-child,
4979+.linked.vertical .button:insensitive:only-child {
4980 border-right-width: 1px;
4981 border-left-width: 1px;
4982 border-image-width: 10px 12px 10px 12px;
4983@@ -383,7 +567,10 @@
4984 .menubar.toolbar .raised.linked .button,
4985 .header-bar .linked .button,
4986 .header-bar .button.raised.linked,
4987-.header-bar .raised.linked .button {
4988+.header-bar .raised.linked .button,
4989+.titlebar .linked .button,
4990+.titlebar .button.raised.linked,
4991+.titlebar .raised.linked .button {
4992 box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4),
4993 inset -1px 0 shade (@dark_bg_color, 0.9);
4994 }
4995@@ -396,7 +583,10 @@
4996 .menubar.toolbar .raised.linked .button:first-child,
4997 .header-bar .linked .button:first-child,
4998 .header-bar .button.raised.linked:first-child,
4999-.header-bar .raised.linked .button:first-child {
5000+.header-bar .raised.linked .button:first-child,
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches