elementary Stylesheet

Merge lp:~elementary-design/egtk/3-19 into lp:~elementary-design/egtk/trunk

  1. 3-19
  2. Merge into trunk
Proposed by Danielle Foré
Status: Merged
Approved by: Sam Hewitt
Approved revision: 636
Merged at revision: 582
Proposed branch: lp:~elementary-design/egtk/3-19
Merge into: lp:~elementary-design/egtk/trunk
Diff against target: 3345 lines (+639/-509)
6 files modified
gtk-3.0/apps.css (+4/-11)
gtk-3.0/gtk-dark.css (+1/-0)
gtk-3.0/gtk-widgets-dark.css (+62/-348)
gtk-3.0/gtk-widgets.css (+569/-138)
gtk-3.0/gtk.css (+2/-11)
plank/dock.theme (+1/-1)
To merge this branch: bzr merge lp:~elementary-design/egtk/3-19
Reviewer Review Type Date Requested Status
Sam Hewitt (community) Approve
Review via email: mp+278389@code.launchpad.net

Commit message

Add compatibility for Gtk+ >=3.19

To post a comment you must log in.
lp:~elementary-design/egtk/3-19 updated
636. By Danielle Foré

use bg_highlight_color for popover selected source list

Revision history for this message
Sam Hewitt (snwh) wrote :

Looks good; doesn't appear to break anything or cause regression

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gtk-3.0/apps.css'
2--- gtk-3.0/apps.css 2015-11-19 20:42:11 +0000
3+++ gtk-3.0/apps.css 2015-11-30 16:54:22 +0000
4@@ -31,17 +31,6 @@
5 0 1px 2px alpha (#000, 0.24);
6 }
7
8-/**************
9- * GNOME Crap *
10- *************/
11-
12-ApDocView, /* Abiword */
13-EogScrollView, /* Eog */
14-CheeseThumbView /* Cheese */
15-{
16- -EogScrollView-shadow-type: none;
17-}
18-
19 /**********
20 * Birdie *
21 *********/
22@@ -265,6 +254,8 @@
23 background-color: #000;
24 }
25
26+.composited-indicator > revealer label,
27+.composited-indicator > revealer image,
28 .composited-indicator > GtkBox > GtkImage,
29 .composited-indicator > GtkBox > GtkLabel,
30 .composited-indicator > GtkRevealer {
31@@ -306,6 +297,8 @@
32 * Slingshot *
33 ************/
34
35+SlingshotWidgetsSearchView button.flat:hover,
36+SlingshotWidgetsSearchView button.flat:focus,
37 SlingshotWidgetsSearchView GtkButton.flat:hover,
38 SlingshotWidgetsSearchView GtkButton.flat:focus {
39 background-color: alpha (#000, 0.20);
40
41=== modified file 'gtk-3.0/gtk-dark.css'
42--- gtk-3.0/gtk-dark.css 2015-08-29 20:20:07 +0000
43+++ gtk-3.0/gtk-dark.css 2015-11-30 16:54:22 +0000
44@@ -39,6 +39,7 @@
45 @define-color selected_bg_color #3d9bda;
46 @define-color selected_fg_color #FFF;
47 @define-color text_color #c0c6c4;
48+@define-color text_shadow_color alpha (#000, 0.4);
49 @define-color titlebar_color #383e41;
50 @define-color title_color shade (@text_color, 0.90);
51 @define-color title_shadow_color alpha (#000, 0.6);
52
53=== modified file 'gtk-3.0/gtk-widgets-dark.css'
54--- gtk-3.0/gtk-widgets-dark.css 2015-10-09 18:25:10 +0000
55+++ gtk-3.0/gtk-widgets-dark.css 2015-11-30 16:54:22 +0000
56@@ -36,29 +36,12 @@
57 * Text Entry *
58 *************/
59
60-.entry {
61- background-image: linear-gradient(to bottom,
62- shade (@base_color, 0.93),
63- shade (@base_color, 0.97)
64- );
65-
66- border-color: alpha (#000, 0.30);
67-
68- box-shadow: inset 0 1px 0 0 alpha (@inset_dark_color, 0.7),
69- inset 0 0 0 1px alpha (@inset_dark_color, 0.3),
70- 0 1px 0 0 alpha (#fff, 0.05);
71-
72- color: @text_color;
73-
74- icon-shadow: 0 1px alpha (#000, 0.4);
75- text-shadow: 0 1px alpha (#000, 0.4);
76-}
77-
78 .entry.progressbar {
79 color: @selected_fg_color;
80 }
81
82-
83+toolbar entry,
84+.titlebar entry,
85 .titlebar .entry,
86 .toolbar .entry {
87 background-image: linear-gradient(to bottom,
88@@ -75,6 +58,8 @@
89 0 1px 0 0 alpha (#fff, 0.05);
90 }
91
92+toolbar entry:backdrop,
93+.titlebar entry:backdrop,
94 .titlebar .entry:backdrop,
95 .toolbar .entry:backdrop {
96 background-image: linear-gradient(to bottom,
97@@ -98,26 +83,6 @@
98 text-shadow: 0 1px alpha (#000, 0.4);
99 }
100
101-.header-bar .entry,
102-.header-bar .entry:focus,
103-.header-bar .entry:backdrop {
104- background-image: linear-gradient(to bottom,
105- shade (#fff, 0.93),
106- shade (#fff, 0.97)
107- );
108-
109- border-color: alpha (#000, 0.25);
110-
111- box-shadow: inset 0 1px 0 0 alpha (#000, 0.08),
112- inset 0 0 0 1px alpha (#000, 0.04),
113- 0 1px 0 0 alpha (#fff, 0.20);
114-
115- color: #333;
116-
117- icon-shadow: 0 1px alpha (#fff, 0.4);
118- text-shadow: 0 1px alpha (#fff, 0.4);
119-}
120-
121 .entry.progressbar,
122 .entry.progressbar:focus {
123 background-image: linear-gradient(to bottom,
124@@ -127,6 +92,7 @@
125 border-color: @colorAccent;
126 }
127
128+entry:focus,
129 .entry:focus {
130 border-color: alpha (#000, 0.30);
131 box-shadow: inset 0 1px 0 0 alpha (@inset_dark_color, 0.7),
132@@ -134,6 +100,7 @@
133 0 1px 0 0 alpha (#fff, 0.05);
134 }
135
136+entry:insensitive,
137 .entry:insensitive {
138 background-image: linear-gradient(to bottom,
139 alpha (#000, 0.05),
140@@ -142,6 +109,8 @@
141 box-shadow: 0 1px 0 0 alpha (#fff, 0.05);
142 }
143
144+.titlebar entry:insensitive,
145+toolbar entry:insensitive,
146 .titlebar .entry:insensitive,
147 .toolbar .entry:insensitive {
148 border-color: alpha (#000, 0.25);
149@@ -149,6 +118,8 @@
150 0 1px 0 0 alpha (#fff, 0.05);
151 }
152
153+.titlebar entry:insensitive:backdrop,
154+toolbar entry:insensitive:backdrop,
155 .titlebar .entry:insensitive:backdrop,
156 .toolbar .entry:insensitive:backdrop {
157 border-color: alpha (#000, 0.20);
158@@ -160,6 +131,11 @@
159 * Progress bar *
160 ****************/
161
162+progressbar progress,
163+levelbar block,
164+levelbar block.filled.low,
165+levelbar block.filled.middle,
166+levelbar block.filled.high,
167 .progressbar,
168 .level-bar.fill-block,
169 .level-bar.fill-block.level-low,
170@@ -168,14 +144,17 @@
171 border-color: transparent;
172 }
173
174+levelbar block.empty,
175 .level-bar.fill-block.empty-fill-block {
176 border-color: alpha (#000, 0.25);
177 }
178
179+levelbar block:backdrop,
180 .level-bar.fill-block:backdrop {
181 border-color: shade (@bg_color, 0.68);
182 }
183
184+levelbar block.empty:backdrop,
185 .level-bar.fill-block.empty-fill-block:backdrop {
186 border-color: shade (@bg_color, 0.75);
187 }
188@@ -184,18 +163,9 @@
189 * Scale *
190 ********/
191
192+scale slider:backdrop,
193 .scale.slider:backdrop {
194- background-image: linear-gradient(to bottom,
195- shade (@bg_color, 1.05),
196- shade (@bg_color, 0.95)
197- );
198-
199 border-color: alpha (#000, 0.20);
200-
201- box-shadow: inset 0 0 0 1px alpha (#fff, 0.01),
202- inset 0 1px 0 0 alpha (#fff, 0.10),
203- inset 0 -1px 0 0 alpha (#fff, 0.03),
204- 0 1px 2px alpha (#000, 0.10);
205 }
206
207 .titlebar .scale.slider,
208@@ -205,15 +175,6 @@
209 box-shadow: none;
210 }
211
212-.scale.trough {
213- border-color: alpha (#000, 0.35);
214-
215- background-image: linear-gradient(to bottom,
216- alpha (#000, 0.15),
217- alpha (#000, 0.07)
218- );
219-}
220-
221 .scale.trough:insensitive {
222 background-color: shade (@theme_bg_color, 1.25);
223 border-color: alpha (#000, 0.35);
224@@ -233,10 +194,6 @@
225 );
226 }
227
228-.scale.mark {
229- background-color: alpha (#000, 0.40);
230-}
231-
232 .scale.highlight.left {
233 border-color: alpha (#000, 0.50);
234
235@@ -259,43 +216,23 @@
236 * Buttons *
237 **********/
238
239+button,
240 .button {
241- text-shadow: 0 1px alpha (#000, 0.4);
242- icon-shadow: 0 1px alpha (#000, 0.4);
243-
244 background-image: linear-gradient(to bottom,
245 shade (@bg_color, 0.9),
246 shade (@bg_color, 0.9) 50%,
247 shade (@bg_color, 0.8)
248 );
249-
250- border-color: shade (@bg_color, 0.5);
251-
252- box-shadow: inset 0 0 0 1px alpha (#fff, 0.02),
253- inset 0 1px 0 0 alpha (#fff, 0.07),
254- inset 0 -1px 0 0 alpha (#fff, 0.01),
255- 0 1px 0 0 alpha (#fff, 0.05);
256-
257 color: @text_color;
258 }
259
260-.header-bar .button.image-button .linked,
261-.header-bar .button.image-button,
262-.header-bar .button,
263-.toolbar .button {
264- background-image: linear-gradient(to bottom,
265- transparent,
266- transparent 50%,
267- alpha (#000, 0.04)
268- );
269-
270- border-color: alpha (#000, 0.30);
271-}
272-
273+button:hover,
274 .button:hover {
275 color:@text_color;
276 }
277
278+button:focus,
279+button.destructive-action:focus,
280 .button:focus,
281 .button.destructive-action:focus {
282 border-color: shade (@colorAccent, 0.2);
283@@ -308,6 +245,8 @@
284 transition: all 100ms ease-out;
285 }
286
287+button.flat,
288+button.flat:backdrop,
289 .button.flat,
290 .button.flat:backdrop {
291 border-color: transparent;
292@@ -316,6 +255,15 @@
293 background-color: transparent;
294 }
295
296+button:active,
297+button:hover:active,
298+button:focus:active,
299+button:checked,
300+button:hover:checked,
301+button:focus:checked,
302+popover actionbar button:active,
303+popover actionbar button:hover:active,
304+popover actionbar button:focus:active,
305 .button:active,
306 .button:hover:active,
307 .button:focus:active,
308@@ -329,10 +277,6 @@
309
310 background-color: alpha (#000, 0.06);
311 background-image: none;
312- border-color: alpha (#000, 0.40);
313-
314- box-shadow: inset 0 0 0 1px alpha (#000, 0.05),
315- 0 1px 0 0 alpha (#fff, 0.05);
316
317 border-color: alpha (#000, 0.37);
318
319@@ -357,6 +301,7 @@
320 border-color: alpha (#000, 0.20);
321 }
322
323+button:active:insensitive,
324 .button:active:insensitive {
325 background-image: linear-gradient(to bottom,
326 shade (@bg_color, 0.85),
327@@ -373,6 +318,7 @@
328 * GtkSwitch *
329 *************/
330
331+switch:active,
332 GtkSwitch.trough:active {
333 border-color: shade (@selected_bg_color, 0.30);
334 box-shadow: inset 0 0 0 1px alpha (#000, 0.10),
335@@ -380,11 +326,13 @@
336 0 1px 0 0 alpha (@bg_highlight_color, 0.30);
337 }
338
339+switch:active:backdrop,
340 GtkSwitch.trough:active:backdrop {
341 box-shadow: inset 0 0 0 1px alpha (#000, 0.10),
342 0 1px 0 0 alpha (@bg_highlight_color, 0.30);
343 }
344
345+switch:active:insensitive,
346 GtkSwitch.trough:active:insensitive {
347 border-color: shade (mix (@bg_color, @colorAccent, 0.5), 0.5);
348 }
349@@ -476,21 +424,6 @@
350 * Notebook and Tabs *
351 ********************/
352
353-.dynamic-notebook .notebook tab:active {
354- box-shadow: inset 0 0 0 1px alpha (#fff, 0.05),
355- 0 0 1px 1px alpha (#000, 0.15);
356-}
357-
358-.dynamic-notebook .notebook tab:active:backdrop {
359- box-shadow: inset 0 0 0 1px alpha (#fff, 0.05),
360- 0 0 0 1px shade (@titlebar_color, 0.70);
361-}
362-
363-.notebook {
364- text-shadow: 0 1px alpha (#000, 0.4);
365- icon-shadow: 0 1px alpha (#000, 0.4);
366-}
367-
368 .notebook tab:active {
369 box-shadow: inset 0 0 0 1px alpha (#fff, 0.10),
370 0 0 0 1px shade (@titlebar_color, 0.56);
371@@ -506,13 +439,13 @@
372 .notebook tab .button:hover,
373 .notebook tab .button:hover:active {
374 padding: 0;
375- background-color: alpha (#000, 0.02);
376+ background-color: alpha (#000, 0.02);
377 border-color: alpha (#000, 0.29);
378 }
379
380 .dynamic-notebook .notebook tab > .button:hover:active,
381 .notebook tab > .button:hover:active {
382- background-color: alpha (#000, 0.10);
383+ background-color: alpha (#000, 0.10);
384 }
385
386 /*************
387@@ -604,14 +537,6 @@
388 * Check and Radio items *
389 *************************/
390
391-.check,
392-.radio,
393-.check:insensitive,
394-.radio:insensitive {
395- background-color: transparent;
396- border-style: none;
397-}
398-
399 GtkCheckButton:hover,
400 GtkCheckButton:active:hover,
401 GtkCheckButton:selected,
402@@ -619,12 +544,14 @@
403 background-color: transparent;
404 }
405
406+check,
407 .check {
408 -gtk-icon-source: -gtk-scaled(url("assets/check-dark.svg"),url("assets/check@2.svg"));
409 background-repeat: no-repeat;
410 background-position: center;
411 }
412
413+check:focus
414 .check:focus {
415 -gtk-icon-source: -gtk-scaled(url("assets/check-focus-dark.svg"),url("assets/check-focus@2.svg"));
416 background-repeat: no-repeat;
417@@ -632,12 +559,14 @@
418 }
419
420
421+radio,
422 .radio {
423 -gtk-icon-source: -gtk-scaled(url("assets/radio-dark.svg"),url("assets/radio@2.svg"));
424 background-repeat: no-repeat;
425 background-position: center;
426 }
427
428+radio:focus,
429 .radio:focus {
430 -gtk-icon-source: -gtk-scaled(url("assets/radio-focus-dark.svg"),url("assets/radio-focus@2.svg"));
431 background-repeat: no-repeat;
432@@ -649,7 +578,7 @@
433 background-image: none;
434 }
435
436-
437+check:checked,
438 .check:active,
439 .check:checked,
440 .menuitem.check:active,
441@@ -657,6 +586,7 @@
442 -gtk-icon-source: -gtk-scaled(url("assets/check-active-dark.svg"),url("assets/check-active@2.svg"));
443 }
444
445+check:checked:focus,
446 .check:active:focus,
447 .check:checked:focus,
448 .menuitem.check:active:focus,
449@@ -664,6 +594,7 @@
450 -gtk-icon-source: -gtk-scaled(url("assets/check-active-focus-dark.svg"),url("assets/check-active@2.svg"));
451 }
452
453+radio:checked,
454 .radio:active,
455 .radio:checked,
456 .menuitem.radio:active,
457@@ -671,6 +602,7 @@
458 -gtk-icon-source: -gtk-scaled(url("assets/radio-active-dark.svg"),url("assets/radio-active@2.svg"));
459 }
460
461+radio:checked:focus,
462 .radio:active:focus,
463 .radio:checked:focus,
464 .menuitem.radio:active:focus,
465@@ -818,36 +750,6 @@
466 * Sidebar & Source List *
467 ************************/
468
469-.sidebar,
470-.sidebar .view,
471-.sidebar GtkScrolledWindow,
472-.source-list,
473-.source-list.view {
474- color: shade (@text_color, 0.90);
475-}
476-
477-.sidebar,
478-.sidebar.view,
479-.sidebar .view,
480-.sidebar.view:selected:backdrop,
481-.sidebar.view:prelight:selected:backdrop,
482-.source-list,
483-.source-list.view,
484-.source-list.view:selected:backdrop,
485-.source-list.view:prelight:selected:backdrop {
486- text-shadow: 0 1px alpha (#000, 0.4);
487- icon-shadow: 0 1px alpha (#000, 0.4);
488-}
489-
490-.sidebar,
491-.source-list {
492- -GtkTreeView-horizontal-separator: 1px;
493- -GtkTreeView-vertical-separator: 6px;
494-}
495-
496-.source-list.category-expander {
497- color: transparent;
498-}
499 .sidebar .view:prelight,
500 .sidebar.view:prelight,
501 .source-list.view:prelight {
502@@ -965,6 +867,7 @@
503 * Destructive Action Button *
504 ****************************/
505
506+button.destructive-action,
507 .destructive-action.button {
508 background-image: linear-gradient(to bottom,
509 shade (@error_color, 1.20),
510@@ -979,6 +882,8 @@
511 border-color: shade (@error_color, 0.30);
512 }
513
514+button.destructive-action label,
515+button.destructive-action label:hover,
516 .destructive-action.button GtkLabel,
517 .destructive-action.button Gtklabel:prelight {
518 color: @selected_fg_color;
519@@ -986,6 +891,8 @@
520 icon-shadow: 0 1px alpha (#000, 0.2);
521 }
522
523+button.destructive-action:active,
524+button.destructive-action:active:hover
525 .destructive-action.button:active,
526 .destructive-action.button:active:hover {
527 background-image: linear-gradient(to bottom,
528@@ -1254,11 +1161,14 @@
529 color: shade (@title_color, 0.80);
530 }
531
532+decoration,
533 .window-frame {
534 box-shadow: 0 0 0 1px alpha (#000, 0.75),
535- 0 12px 30px -6px alpha (#000, 0.80);
536+ 0 14px 28px rgba(0,0,0,0.35),
537+ 0 10px 10px rgba(0,0,0,0.22);
538 }
539
540+.popup decoration,
541 .window-frame.menu.csd,
542 .window-frame.popup.csd {
543 box-shadow: 0 0 0 1px alpha (#000, 0.60),
544@@ -1266,6 +1176,7 @@
545 0 3px 6px alpha (#000, 0.23);
546 }
547
548+menu .popup decoration,
549 .menu .window-frame.menu.csd,
550 .menu .window-frame.popup.csd {
551 box-shadow: 0 0 0 1px alpha (#000, 0.60),
552@@ -1273,91 +1184,12 @@
553 0 6px 6px alpha (#000, 0.23);
554 }
555
556+decoration:backdrop,
557 .window-frame:backdrop {
558 box-shadow: 0 0 0 1px alpha (#000, 0.75),
559- 0 6px 10px -3px alpha (#000, 0.90);
560-}
561-
562-/***************
563- * Header Bars *
564- **************/
565-
566-.header-bar {
567- background-image: linear-gradient(to bottom,
568- shade (@headerbar_color, 1.04),
569- shade (@headerbar_color, 0.84)
570- );
571-
572- border-color: shade (@headerbar_color, 0.35);
573-
574- text-shadow: 0 1px alpha (#fff, 0.4);
575- icon-shadow: 0 1px alpha (#fff, 0.4);
576-
577- box-shadow: inset 0 0 0 1px alpha (#fff, 0.10),
578- inset 0 1px 0 0 alpha (#fff, 0.20);
579-}
580-
581-.header-bar:backdrop {
582- background-image: linear-gradient(to bottom,
583- @headerbar_color,
584- shade (@headerbar_color, 0.90)
585- );
586- border-color: shade (@headerbar_color, 0.40);
587-
588- box-shadow: inset 0 0 0 1px alpha (#fff, 0.10);
589-}
590-
591-.header-bar .title,
592-.header-bar .button,
593-.header-bar .button:active,
594-.header-bar .button:checked,
595-.header-bar .button.image-button GtkImage,
596-.header-bar .titlebutton GtkImage,
597-.header-bar > GtkLabel,
598-.header-bar > GtkBox GtkLabel {
599- color: shade (@headerbar_color, 0.40);
600- text-shadow: 0 1px alpha (#fff, 0.15);
601- icon-shadow: 0 1px alpha (#fff, 0.15);
602-}
603-
604-.header-bar .title:backdrop,
605-.header-bar .subtitle:backdrop,
606-.header-bar .titlebutton:backdrop,
607-.header-bar .button.image-button GtkImage:backdrop,
608-.header-bar .button:backdrop,
609-.header-bar .button:active:backdrop,
610-.header-bar .button:checked:backdrop,
611-.header-bar .titlebutton GtkImage:backdrop,
612-.header-bar GtkLabel:backdrop {
613- color: shade (@headerbar_color, 0.60);
614- icon-shadow: none;
615-}
616-
617-.header-bar .button.image-button GtkImage:insensitive {
618- color: @insensitive_color;
619- icon-shadow: 0 1px alpha (#fff, 0.15);
620- -gtk-image-effect: dim;
621-}
622-
623-/* Reset GtkDialog Headerbar Button Color */
624-
625-GtkDialog .header-bar .title,
626-GtkDialog .header-bar .button,
627-GtkDialog .header-bar .button:active,
628-GtkDialog .header-bar .button.image-button GtkImage,
629-GtkDialog .header-bar .titlebutton GtkImage {
630- color: @text_color;
631- text-shadow: 0 1px alpha (#000, 0.4);
632- icon-shadow: 0 1px alpha (#000, 0.4);
633-}
634-
635-GtkDialog .header-bar .title:backdrop,
636-GtkDialog .header-bar .button:backdrop,
637-GtkDialog .header-bar .button:active:backdrop,
638-GtkDialog .header-bar .button.image-button GtkImage:backdrop,
639-GtkDialog .header-bar .titlebutton GtkImage:backdrop {
640- color: shade (@text_color, 0.70);
641- icon-shadow: none;
642+ 0 3px 6px alpha (#000, 0.16),
643+ 0 3px 6px alpha (#000, 0.23),
644+ 0 14px 28px transparent;
645 }
646
647 .titlebar .subtitle {
648@@ -1366,122 +1198,4 @@
649 icon-shadow: 0 1px alpha (#fff, 0.15);
650 }
651
652-.header-bar > GtkLabel,
653-.header-bar > GtkImage {
654- color: shade (@text_color, 0.90);
655-}
656-
657-.header-bar .button.image-button {
658- border-color: transparent;
659- background-image: none;
660- box-shadow: none;
661-}
662-
663-.header-bar .button.image-button:active,
664-.header-bar .button.image-button:hover:active,
665-.header-bar .button.image-button:focus:active {
666- background-color: alpha (#000, 0.10);
667-
668- box-shadow: inset 0 0 0 1px alpha (#000, 0.07);
669-
670- border-color: alpha (#000, 0.32);
671-}
672-
673-/***************************
674- * Default Decoration *
675- **************************/
676-
677-.titlebar.default-decoration {
678- box-shadow: inset 0 1px 0 0 alpha (#fff, 0.15);
679-}
680-
681-.titlebar.default-decoration .title,
682-.titlebar.default-decoration .button.image-button GtkImage {
683- color: @title_color;
684- text-shadow: 0 1px @title_shadow_color;
685- icon-shadow: 0 1px @title_shadow_color;
686-}
687-
688-.titlebar.default-decoration .subtitle {
689- color: shade (@titlebar_color, 0.50);
690- text-shadow: 0 1px @title_shadow_color;
691- icon-shadow: 0 1px @title_shadow_color;
692-}
693-
694-.titlebar.default-decoration .titlebutton GtkImage {
695- color: shade (@title_color, 0.9);
696- icon-shadow: 0 1px @title_shadow_color;
697-}
698-
699-.titlebar.default-decoration:backdrop {
700- background-image: linear-gradient(to bottom,
701- shade (@titlebar_color, 1.10),
702- @titlebar_color
703- );
704-
705- box-shadow: inset 0 1px 0 0 alpha (#fff, 0.08);
706-}
707-
708-.titlebar.default-decoration .title:backdrop,
709-.titlebar.default-decoration .subtitle:backdrop,
710-.titlebar.default-decoration .titlebutton GtkImage:backdrop,
711-.titlebar.default-decoration .button.image-button GtkImage:backdrop {
712- color: shade (@title_color, 0.80);
713- text-shadow: none;
714- icon-shadow: none;
715-}
716-
717-/***************
718- * Dialog *
719- ***************/
720-
721-GtkDialog .titlebar,
722-GtkMessageDialog .titlebar,
723-GtkDialog .titlebar.default-decoration,
724-GtkMessageDialog .titlebar.default-decoration {
725- background-image: linear-gradient(to bottom,
726- shade (@bg_color, 1.2),
727- @bg_color
728- );
729-
730- box-shadow: inset 1px 0 0 0 alpha (#fff, 0.05),
731- inset -1px 0 0 0 alpha (#fff, 0.05),
732- inset 0 1px 0 0 alpha (#fff, 0.15);
733-}
734-
735-GtkDialog .titlebar:backdrop,
736-GtkMessageDialog .titlebar:backdrop,
737-GtkDialog .titlebar.default-decoration:backdrop,
738-GtkMessageDialog .titlebar.default-decoration:backdrop {
739- box-shadow: inset 1px 0 0 0 alpha (#fff, 0.05),
740- inset -1px 0 0 0 alpha (#fff, 0.05),
741- inset 0 1px 0 0 alpha (#fff, 0.15);
742-}
743-
744-GtkDialog,
745-GtkMessageDialog {
746- box-shadow: inset 1px 0 0 0 alpha (#fff, 0.05),
747- inset -1px 0 0 0 alpha (#fff, 0.05),
748- inset 0 -1px 0 0 alpha (#fff, 0.07);
749-
750-}
751-
752-GtkDialog.window-frame,
753-GtkDialog.window-frame:backdrop,
754-.window-frame.dialog,
755-.window-frame.dialog:backdrop {
756- box-shadow: 0 0 0 1px alpha (#000, 0.80),
757- 0 10px 20px alpha (#000, 0.19),
758- 0 6px 6px alpha (#000, 0.23);
759-}
760-
761-/**************
762-* Text Styles *
763-**************/
764-
765-.h4,
766-.category-label {
767- text-shadow: 0 1px alpha (#000, 0.2);
768-}
769-
770 @import url("apps.css");
771
772=== modified file 'gtk-3.0/gtk-widgets.css'
773--- gtk-3.0/gtk-widgets.css 2015-11-21 05:23:00 +0000
774+++ gtk-3.0/gtk-widgets.css 2015-11-30 16:54:22 +0000
775@@ -68,6 +68,14 @@
776 color: @fg_color;
777 }
778
779+image,
780+image:insensitive,
781+label,
782+label:insensitive,
783+box,
784+box:insensitive,
785+grid,
786+grid:insensitive,
787 GtkImage,
788 GtkImage:insensitive,
789 GtkLabel,
790@@ -83,6 +91,8 @@
791 * Tooltips *
792 ************/
793
794+tooltip,
795+tooltip.background,
796 .tooltip,
797 .overlay-bar {
798 background-color: alpha (#000, 0.7);
799@@ -93,6 +103,8 @@
800 text-shadow: 0 1px 2px alpha (#000, 0.6);
801 }
802
803+tooltip label,
804+.overlay-bar label,
805 .tooltip GtkLabel,
806 .overlay-bar GtkLabel {
807 color: white;
808@@ -109,17 +121,20 @@
809 }
810 }
811
812+spinner,
813 .spinner {
814 background-image: none;
815 opacity: 0;
816 -gtk-icon-source: -gtk-icontheme("process-working-symbolic");
817 }
818
819+spinner:active,
820 .spinner:active {
821 opacity: 0.8;
822 animation: spin 600ms linear infinite;
823 }
824
825+spinner:active:insensitive,
826 .spinner:active:insensitive {
827 opacity: 0.4;
828 }
829@@ -145,10 +160,12 @@
830 * Separators *
831 *************/
832
833+separator,
834 .separator {
835 color: @menu_separator;
836 }
837
838+separator.vertical,
839 .vertical.separator {
840 color: @menu_separator;
841 padding: 0 4px;
842@@ -158,15 +175,20 @@
843 border-right: 1px solid @menu_separator_shadow;
844 }
845
846+paned,
847 GtkPaned {
848 margin-right: 8px;
849 -gtk-icon-source: none;
850 }
851
852+paned.vertical,
853 GtkPaned.vertical {
854 margin-bottom: 8px;
855 }
856
857+paned separator,
858+paned separator:prelight,
859+paned separator:selected,
860 .pane-separator,
861 .pane-separator:prelight,
862 .pane-separator:selected {
863@@ -175,6 +197,7 @@
864 shade (@base_color, 0.55),
865 shade (@base_color, 0.55)
866 );
867+ -gtk-icon-source: none;
868 }
869
870 GraniteWidgetsThinPaned {
871@@ -183,6 +206,7 @@
872 margin: 0;
873 }
874
875+toolbar paned separator,
876 .toolbar .pane-separator,
877 .titlebar .pane-separator {
878 background-color: transparent;
879@@ -195,6 +219,8 @@
880 * Text Entry *
881 *************/
882
883+entry,
884+spinbutton,
885 .entry {
886 background-image: linear-gradient(to bottom,
887 shade (@base_color, 0.93),
888@@ -210,8 +236,8 @@
889
890 color: @text_color;
891
892- icon-shadow: 0 1px alpha (#fff, 0.4);
893- text-shadow: 0 1px alpha (#fff, 0.4);
894+ icon-shadow: 0 1px @text_shadow_color;
895+ text-shadow: 0 1px @text_shadow_color;
896
897 padding: 4px;
898
899@@ -219,28 +245,40 @@
900 -gtk-icon-style: symbolic;
901 }
902
903+entry:selected,
904+entry:selected:focus,
905+spinbutton:selected,
906+spinbutton:selected:focus,
907 .entry:selected,
908 .entry:selected:focus {
909 background-color: @colorAccent;
910 }
911
912+headerbar entry,
913+headerbar spinbutton,
914+toolbar entry,
915+toolbar spinbutton,
916 GtkHandleBox .entry,
917 .titlebar .entry,
918 .toolbar .entry {
919 background-image: linear-gradient(to bottom,
920- alpha (#000, 0.08),
921- transparent 5px
922+ alpha (#000, 0.05),
923+ transparent 3px
924 ),
925 linear-gradient(to bottom,
926 shade (@base_color, 0.93),
927 @base_color
928 );
929
930- border-color: alpha (#000, 0.27);
931+ border-color: alpha (#000, 0.24);
932 box-shadow: inset 0 0 0 1px @inset_dark_color,
933 0 1px 0 0 alpha (@bg_highlight_color, 0.30);
934 }
935
936+headerbar entry:backdrop,
937+headerbar spinbutton:backdrop,
938+toolbar entry:backdrop,
939+toolbar spinbutton:backdrop,
940 GtkHandleBox .entry:backdrop,
941 .titlebar .entry:backdrop,
942 .toolbar .entry:backdrop {
943@@ -260,6 +298,8 @@
944 0 1px 0 0 alpha (@bg_highlight_color, 0.30);
945 }
946
947+entry:focus,
948+spinbutton:focus,
949 .entry:focus {
950 border-color: alpha (@colorAccent, 0.80);
951 box-shadow: inset 0 0 0 1px alpha (@colorAccent, 0.23),
952@@ -268,6 +308,10 @@
953 transition: all 200ms ease-in;
954 }
955
956+entry.error,
957+entry.error:focus,
958+spinbutton.error,
959+spinbutton.error:focus,
960 .entry.error,
961 .entry.error:focus {
962 border-color: alpha (@error_color, 0.80);
963@@ -277,6 +321,8 @@
964 transition: all 200ms ease-in;
965 }
966
967+entry:insensitive,
968+spinbutton:insensitive,
969 .entry:insensitive {
970 background-image: none;
971
972@@ -289,6 +335,10 @@
973 color: @insensitive_color;
974 }
975
976+headerbar entry:insensitive,
977+headerbar spinbutton:insensitive,
978+toolbar entry:insensitive,
979+toolbar spinbutton:insensitive,
980 .titlebar .entry:insensitive,
981 .toolbar .entry:insensitive {
982 background: transparent;
983@@ -296,6 +346,10 @@
984 box-shadow: inset 0 0 0 1px alpha (@inset_dark_color, 0.25), 0 1px 0 0 alpha (@bg_highlight_color, 0.30);
985 }
986
987+headerbar entry:insensitive:backdrop,
988+headerbar spinbutton:insensitive:backdrop,
989+toolbar entry:insensitive:backdrop,
990+toolbar spinbutton:insensitive:backdrop,
991 .titlebar .entry:insensitive:backdrop,
992 .toolbar .entry:insensitive:backdrop {
993 background-image: none;
994@@ -303,6 +357,8 @@
995 box-shadow: 0 1px 0 0 alpha (@bg_highlight_color, 0.30);
996 }
997
998+entry image.left,
999+entry:insensitive:backdrop image.left,
1000 .entry.image.left,
1001 .entry:insensitive:backdrop.image.left {
1002 padding-right: 6px;
1003@@ -313,26 +369,35 @@
1004 * Symbolic images *
1005 *******************/
1006
1007+image,
1008+image:selected,
1009 .image,
1010 .image:selected {
1011 color: @internal_element_color;
1012 }
1013
1014+image:hover,
1015 .image:hover {
1016 color: @internal_element_prelight;
1017 }
1018
1019+image:selected:focus,
1020+image:selected:hover,
1021 .image:selected:focus,
1022 .image:selected:hover {
1023 color: @selected_fg_color;
1024 }
1025
1026+view image,
1027+view image:hover,
1028+view image:selected,
1029 .view.image,
1030 .view.image:hover,
1031 .view.image:selected {
1032 color: @view_symbolic_color;
1033 }
1034
1035+view image:selected:focus,
1036 .view.image:selected:focus {
1037 color: @selected_fg_color;
1038 }
1039@@ -341,6 +406,7 @@
1040 * Progress bar *
1041 ****************/
1042
1043+progressbar progress,
1044 .progressbar,
1045 .progressbar row,
1046 .progressbar row:hover {
1047@@ -356,6 +422,7 @@
1048 inset 0 -1px 0 0 alpha (#fff, 0.15);
1049 }
1050
1051+progressbar.vertical progress,
1052 .progressbar.vertical {
1053 background-image: linear-gradient(to right,
1054 shade (@colorAccent, 1.25),
1055@@ -363,6 +430,7 @@
1056 );
1057 }
1058
1059+progressbar progress:backdrop,
1060 .progressbar:backdrop,
1061 .progressbar row:backdrop,
1062 .progressbar row:backdrop:hover,
1063@@ -377,6 +445,7 @@
1064 inset 0 -1px 0 0 alpha (@bg_highlight_color, 0.15);
1065 }
1066
1067+progressbar trough,
1068 GtkProgressBar.trough,
1069 .trough row,
1070 .trough row:hover {
1071@@ -395,6 +464,7 @@
1072 0 1px 0 0 alpha (@bg_highlight_color, 0.50);
1073 }
1074
1075+progressbar trough.vertical,
1076 GtkProgressBar.trough.vertical {
1077 background-image: linear-gradient(to right,
1078 @bg_color,
1079@@ -402,6 +472,7 @@
1080 );
1081 }
1082
1083+progressbar trough:backdrop,
1084 GtkProgressBar.trough:backdrop,
1085 .trough row:backdrop,
1086 .trough row:backdrop:hover,
1087@@ -417,6 +488,9 @@
1088 border: 1px solid shade (@colorAccent, 0.80);
1089 }
1090
1091+entry progress,
1092+entry progress:focus,
1093+spinbutton progress,
1094 .entry.progressbar,
1095 .entry.progressbar:focus {
1096 background-image: linear-gradient(to bottom,
1097@@ -434,20 +508,28 @@
1098 inset 0 0 0 1px alpha (@inset_dark_color, 0.3);
1099 }
1100
1101+entry progress {
1102+ border-top-left-radius: 2.5px;
1103+ border-bottom-left-radius: 2.5px;
1104+}
1105+
1106 /************
1107 * Level Bar *
1108 ************/
1109
1110+levelbar,
1111 .level-bar {
1112 -GtkLevelBar-min-block-width: 24;
1113 -GtkLevelBar-min-block-height: 6;
1114 }
1115
1116+levelbar.vertical,
1117 .level-bar.vertical {
1118 -GtkLevelBar-min-block-width: 6;
1119 -GtkLevelBar-min-block-height: 34;
1120 }
1121
1122+levelbar trough,
1123 .level-bar.trough {
1124 background-image: none;
1125 background-color: transparent;
1126@@ -455,6 +537,7 @@
1127 padding: 0;
1128 }
1129
1130+levelbar block,
1131 .level-bar.fill-block {
1132 background-color: @selected_bg_color;
1133 background-image: linear-gradient(to bottom,
1134@@ -473,6 +556,7 @@
1135 transition: all 100ms ease-in;
1136 }
1137
1138+levelbar block.filled.low,
1139 .level-bar.fill-block.level-low {
1140 background-image: linear-gradient(to bottom,
1141 shade (@error_color, 1.30),
1142@@ -487,6 +571,7 @@
1143 border-color: shade (@error_color, 0.90);
1144 }
1145
1146+levelbar block.filled.middle,
1147 .level-bar.fill-block.level-middle {
1148 background-image: linear-gradient(to bottom,
1149 shade (@warning_color, 1.30),
1150@@ -501,6 +586,7 @@
1151 border-color: shade (@warning_color, 0.90);
1152 }
1153
1154+levelbar block.filled.high,
1155 .level-bar.fill-block.level-high {
1156 background-image: linear-gradient(to bottom,
1157 shade (@success_color, 1.10),
1158@@ -510,6 +596,7 @@
1159 border: 1px solid shade (@success_color, 0.90);
1160 }
1161
1162+levelbar block.empty,
1163 .level-bar.fill-block.empty-fill-block {
1164 background-color: shade (@bg_color, 0.95);
1165 background-image: linear-gradient(to bottom,
1166@@ -523,6 +610,7 @@
1167 0 1px 0 0 alpha (@bg_highlight_color, 0.15);
1168 }
1169
1170+levelbar block:backdrop,
1171 .level-bar.fill-block:backdrop {
1172 background-image: none;
1173 background-color: shade (@bg_color, 0.85);
1174@@ -533,15 +621,18 @@
1175 0 1px 0 0 alpha (@bg_highlight_color, 0.15);
1176 }
1177
1178+levelbar block.empty:backdrop,
1179 .level-bar.fill-block.empty-fill-block:backdrop {
1180 background-color: shade (@bg_color, 0.95);
1181 border-color: shade (@bg_color, 0.75);
1182 }
1183
1184+levelbar block.discrete.horizontal,
1185 .level-bar.fill-block.indicator-discrete.horizontal {
1186 margin: 0 2px;
1187 }
1188
1189+levelbar block.discrete.vertical,
1190 .level-bar.fill-block.indicator-discrete.vertical {
1191 margin: 2px 0;
1192 }
1193@@ -649,6 +740,7 @@
1194 * Scale *
1195 ********/
1196
1197+scale,
1198 .scale {
1199 -GtkScale-slider-length: 22;
1200 -GtkRange-slider-width: 22;
1201@@ -656,6 +748,7 @@
1202
1203 }
1204
1205+scale slider,
1206 .scale.slider {
1207 background-image: linear-gradient(to bottom,
1208 shade (@bg_color, 1.05),
1209@@ -672,6 +765,7 @@
1210 margin: 3px;
1211 }
1212
1213+scale slider:focus,
1214 .scale.slider:focus {
1215 background-image: linear-gradient(to bottom,
1216 shade (@bg_color, 1.05),
1217@@ -685,6 +779,7 @@
1218 0 1px 2px alpha (@colorAccent, 0.16);
1219 }
1220
1221+scale slider:backdrop,
1222 .scale.slider:backdrop {
1223 background-image: linear-gradient(to bottom,
1224 shade (@bg_color, 1.05),
1225@@ -693,18 +788,20 @@
1226
1227 border-color: alpha (#000, 0.15);
1228
1229- box-shadow: inset 0 0 0 1px alpha (#fff, 0.10),
1230- inset 0 1px 0 0 alpha (#fff, 0.90),
1231- inset 0 -1px 0 0 alpha (#fff, 0.30),
1232+ box-shadow: inset 0 0 0 1px alpha (@bg_highlight_color, 0.10),
1233+ inset 0 1px 0 0 alpha (@bg_highlight_color, 0.90),
1234+ inset 0 -1px 0 0 alpha (@bg_highlight_color, 0.30),
1235 0 1px 1px alpha (#000, 0.10);
1236 }
1237
1238+scale slider:insensitive,
1239 .scale.slider:insensitive {
1240 background-image: none;
1241 border: none;
1242 box-shadow: none;
1243 }
1244
1245+scale trough,
1246 .scale.trough {
1247 margin: 9px 0 8px 0;
1248
1249@@ -720,6 +817,7 @@
1250 0 1px 0 0 alpha (@bg_highlight_color, 0.30);
1251 }
1252
1253+headerbar scale trough,
1254 .titlebar .scale.trough {
1255 border-radius: 0 12px 12px 0;
1256 border-width: 1px 1px 1px 0;
1257@@ -730,6 +828,7 @@
1258 border-width: 1px 1px 1px 0;
1259 }
1260
1261+scale.vertical trough,
1262 .scale.trough.vertical {
1263 margin: 0 9px 0 8px;
1264
1265@@ -749,10 +848,12 @@
1266 border-radius: 0 0 12px 12px;
1267 }
1268
1269+scale mark,
1270 .scale.mark {
1271- background-color: alpha (#000, 0.40);
1272+ color: mix (@bg_color, @text_color, 0.3);
1273 }
1274
1275+scale highlight,
1276 .scale.highlight.left {
1277 border: 1px solid alpha (#000, 0.50);
1278 border-radius: 12px 0 0 12px;
1279@@ -766,6 +867,7 @@
1280 0 1px 0 0 alpha (@bg_highlight_color, 0.30);
1281 }
1282
1283+scale highlight:insensitive,
1284 .scale.highlight.left:insensitive {
1285 border-color: alpha (#000, 0.35);
1286 border-radius: 12px 0 0 12px;
1287@@ -780,8 +882,10 @@
1288 0 1px 0 0 alpha (@bg_highlight_color, 0.30);
1289 }
1290
1291+scale.vertical highlight,
1292 .scale.highlight.bottom {
1293 border-color: alpha (#000, 0.50);
1294+ border-radius: 12px 12px 0 0;
1295
1296 background-image: linear-gradient(to right,
1297 alpha (#000, 0.40),
1298@@ -792,6 +896,7 @@
1299 0 1px 0 0 alpha (@bg_highlight_color, 0.30);
1300 }
1301
1302+scale.vertical highlight:insensitive,
1303 .scale.highlight.bottom:insensitive {
1304 border-color: alpha (#000, 0.40);
1305
1306@@ -805,21 +910,32 @@
1307 * Frames *
1308 *********/
1309
1310+frame,
1311 .frame {
1312 border: 1px solid @border_color;
1313 color: lighter (@fg_color);
1314 }
1315
1316+scrolledwindow.frame,
1317 GtkScrolledWindow.frame {
1318 border: 1px solid @border_color;
1319 }
1320
1321+frame.flat,
1322+scrolledwindow viewport.frame,
1323 .frame.flat,
1324-.sidebar .frame, /* FIXME: This is a workaround for Geary */
1325 GtkScrolledWindow GtkViewport.frame {
1326 border: none;
1327 }
1328
1329+overshoot.left,
1330+overshoot.right,
1331+overshoot.top,
1332+overshoot.bottom,
1333+undershoot.left,
1334+undershoot.right,
1335+undershoot.top,
1336+undershoot.bottom,
1337 .overshoot.left,
1338 .overshoot.right,
1339 .overshoot.top,
1340@@ -838,6 +954,7 @@
1341 * Buttons *
1342 **********/
1343
1344+button,
1345 .button,
1346 .button.menuitem.menubar,
1347 GtkColorButton.button,
1348@@ -848,10 +965,12 @@
1349 -GtkButton-default-border: 0;
1350 }
1351
1352+button,
1353+actionbar button.text-button,
1354 .button,
1355 .action-bar .button.text-button {
1356- text-shadow: 0 1px alpha (#fff, 0.4);
1357- icon-shadow: 0 1px alpha (#fff, 0.4);
1358+ text-shadow: 0 1px @text_shadow_color;
1359+ icon-shadow: 0 1px @text_shadow_color;
1360
1361 background-image: linear-gradient(to bottom,
1362 transparent,
1363@@ -859,23 +978,25 @@
1364 alpha (#000, 0.04)
1365 );
1366
1367- border: 1px solid alpha (#000, 0.2);
1368+ border: 1px solid @border_color;
1369 border-radius: 2.5px;
1370
1371- box-shadow: inset 0 0 0 1px alpha (#fff, 0.05),
1372- inset 0 1px 0 0 alpha (#fff, 0.45),
1373- inset 0 -1px 0 0 alpha (#fff, 0.15),
1374- 0 1px 0 0 alpha (#fff, 0.15);
1375+ box-shadow: inset 0 0 0 1px alpha (@bg_highlight_color, 0.05),
1376+ inset 0 1px 0 0 alpha (@bg_highlight_color, 0.45),
1377+ inset 0 -1px 0 0 alpha (@bg_highlight_color, 0.15),
1378+ 0 1px 0 0 alpha (@bg_highlight_color, 0.15);
1379
1380 color: @text_color;
1381
1382 transition: all 100ms ease-in;
1383 }
1384
1385+button label,
1386 .button GtkLabel {
1387 padding: 0 6px;
1388 }
1389
1390+titlebar button,
1391 .titlebar .button {
1392 color: shade (@textColorPrimary, 0.8);
1393 border-color: alpha (#000, 0.27);
1394@@ -887,21 +1008,40 @@
1395 0 1px 0 0 alpha (shade (@colorPrimary, 1.4), 0.30);*/
1396 }
1397
1398+button.color {
1399+ padding: 3px;
1400+}
1401+
1402+button.color colorswatch {
1403+ border-radius: 2px;
1404+ box-shadow: 0 1px 0 0 alpha (@bg_highlight_color, 0.15);
1405+}
1406+
1407+button.color overlay {
1408+ border-radius: 2px;
1409+ box-shadow: inset 0 0 1px 1px alpha (#000, 0.2);
1410+}
1411+
1412+button:backdrop,
1413 .button:backdrop {
1414 background-image: none;
1415-
1416 border-color: alpha (#000, 0.2);
1417 }
1418
1419+headerbar button,
1420+toolbar button,
1421 .header-bar .button,
1422 .toolbar .button {
1423 padding: 3px;
1424 }
1425
1426+button:hover,
1427 .button:hover {
1428 color:@text_color;
1429 }
1430
1431+button:focus,
1432+popover actionbar button:focus,
1433 .button:focus,
1434 .popover .action-bar .button:focus {
1435 color:@text_color;
1436@@ -916,6 +1056,8 @@
1437 transition: all 100ms ease-out;
1438 }
1439
1440+button.flat,
1441+button.flat:backdrop,
1442 .button.flat,
1443 .button.flat:backdrop {
1444 border-color: transparent;
1445@@ -925,6 +1067,8 @@
1446 border-radius: 5px;
1447 }
1448
1449+button.flat:focus,
1450+button.flat:focus:hover,
1451 .button.flat:focus,
1452 .button.flat:focus:hover {
1453 background-color: alpha (#000, 0.20);
1454@@ -937,6 +1081,11 @@
1455 0 1px 0 alpha (#fff, 0.3);
1456 } */
1457
1458+dialog button.flat.image-button,
1459+dialog button.flat.image-button:backdrop,
1460+dialog button.flat.image-button:insensitive,
1461+dialog button.flat.image-button:hover,
1462+dialog button.flat.image-button:focus:active,
1463 GtkDialog .button.flat.image-button,
1464 GtkDialog .button.flat.image-button:backdrop,
1465 GtkDialog .button.flat.image-button:insensitive,
1466@@ -950,10 +1099,17 @@
1467 box-shadow: none;
1468 }
1469
1470+dialog button.flat.image-button:hover,
1471 GtkDialog .button.flat.image-button:hover {
1472 background-color: alpha (@text_color, 0.7);
1473 }
1474
1475+button:active,
1476+button:hover:active,
1477+button:focus:active,
1478+button:checked,
1479+button:hover:checked,
1480+button:focus:checked,
1481 .button:active,
1482 .button:hover:active,
1483 .button:focus:active,
1484@@ -965,9 +1121,10 @@
1485 border-color: alpha (#000, 0.25);
1486
1487 box-shadow: inset 0 0 0 1px alpha (#000, 0.05),
1488- 0 1px 0 0 alpha (#fff, 0.30);
1489+ 0 1px 0 0 alpha (@bg_highlight_color, 0.30);
1490 }
1491
1492+button.flat:active,
1493 .button.flat:active {
1494 border-color: transparent;
1495 box-shadow: none;
1496@@ -1033,6 +1190,9 @@
1497 box-shadow: none;
1498 }
1499
1500+button.link,
1501+button.link:active,
1502+button.link:focus:active
1503 GtkLinkButton.button,
1504 GtkLinkButton.button:active,
1505 GtkLinkButton.button:focus:active {
1506@@ -1043,6 +1203,7 @@
1507 background-color: transparent;
1508 }
1509
1510+button.link label,
1511 GtkLinkButton GtkLabel {
1512 color: @link_color;
1513 }
1514@@ -1088,10 +1249,14 @@
1515 * Secondary Toolbar Button *
1516 ***************************/
1517
1518+toolbar.secondary-toolbar button,
1519 .secondary-toolbar.toolbar .button {
1520 padding: 0 3px 0 3px;
1521 }
1522
1523+toolbar.secondary-toolbar button.flat,
1524+toolbar.secondary-toolbar button.flat:backdrop,
1525+toolbar.secondary-toolbar button.flat:insensitive,
1526 .secondary-toolbar.toolbar .button.flat,
1527 .secondary-toolbar.toolbar .button.flat:backdrop,
1528 .secondary-toolbar.toolbar .button.flat:insensitive {
1529@@ -1141,6 +1306,7 @@
1530 * GtkSpinButton *
1531 *****************/
1532
1533+spinbutton button,
1534 .spinbutton .button {
1535 color: @internal_element_color;
1536 padding: 2px 6px;
1537@@ -1154,23 +1320,28 @@
1538 background-image: none;
1539 }
1540
1541+spinbutton button:first-child,
1542 .spinbutton .button:first-child {
1543 border-radius: 2px 0 0 2px;
1544 box-shadow: none;
1545 }
1546
1547+spinbutton button:last-child,
1548 .spinbutton .button:last-child {
1549 border-radius: 0 2px 2px 0;
1550 }
1551
1552+spinbutton button:dir(rtl),
1553 .spinbutton .button:dir(rtl) {
1554 box-shadow: inset -1px 0 alpha (#000, 0.10);
1555 }
1556
1557+spinbutton.vertical,
1558 .spinbutton.vertical {
1559 border-radius: 0;
1560 }
1561
1562+spinbutton.vertical button,
1563 .spinbutton.vertical .button {
1564 padding-top: 0;
1565 padding-bottom: 0;
1566@@ -1180,19 +1351,21 @@
1567 alpha (#000, 0.04)
1568 );
1569
1570- border: 1px solid alpha (#000, 0.2);
1571+ border: 1px solid @border_color;
1572
1573- box-shadow: inset 0 0 0 1px alpha (#fff, 0.05),
1574- inset 0 1px 0 0 alpha (#fff, 0.45),
1575- inset 0 -1px 0 0 alpha (#fff, 0.15),
1576- 0 1px 0 0 alpha (#fff, 0.15);
1577+ box-shadow: inset 0 0 0 1px alpha (@bg_highlight_color, 0.05),
1578+ inset 0 1px 0 0 alpha (@bg_highlight_color, 0.45),
1579+ inset 0 -1px 0 0 alpha (@bg_highlight_color, 0.15),
1580+ 0 1px 0 0 alpha (@bg_highlight_color, 0.15);
1581 }
1582
1583+spinbutton.vertical button:first-child,
1584 .spinbutton.vertical .button:first-child {
1585 border-radius: 2.5px 2.5px 0 0;
1586 border-bottom: 0;
1587 }
1588
1589+spinbutton.vertical button:last-child,
1590 .spinbutton.vertical .button:last-child {
1591 border-radius: 0 0 2.5px 2.5px;
1592 border-top: 0;
1593@@ -1206,34 +1379,43 @@
1594 box-shadow: none;
1595 }
1596
1597+colorswatch.dark,
1598 GtkColorSwatch.color-dark {
1599 color: white;
1600 outline-color: rgba(0, 0, 0, 0.3);
1601 }
1602
1603+colorswatch.dark:backdrop,
1604 GtkColorSwatch.color-dark:backdrop {
1605 color: rgba(255, 255, 255, 0.3);
1606 }
1607
1608+colorswatch.light,
1609 GtkColorSwatch.color-light {
1610 color: black;
1611 outline-color: rgba(255, 255, 255, 0.5);
1612 }
1613
1614+colorswatch.light:backdrop,
1615 GtkColorSwatch.color-light:backdrop {
1616 color: rgba(0, 0, 0, 0.3);
1617 }
1618
1619+colorswatch.top,
1620 GtkColorSwatch.top {
1621 border-top-left-radius: 4px;
1622 border-top-right-radius: 4px;
1623 }
1624
1625+colorswatch.bottom,
1626 GtkColorSwatch.bottom {
1627 border-bottom-left-radius: 4px;
1628 border-bottom-right-radius: 4px;
1629 }
1630
1631+colorswatch.left,
1632+colorswatch:first-child,
1633+colorswatch:first-child .overlay,
1634 GtkColorSwatch.left,
1635 GtkColorSwatch:first-child,
1636 GtkColorSwatch:first-child .overlay {
1637@@ -1241,6 +1423,9 @@
1638 border-bottom-left-radius: 4px;
1639 }
1640
1641+colorswatch.right,
1642+colorswatch:last-child,
1643+colorswatch:last-child .overlay,
1644 GtkColorSwatch.right,
1645 GtkColorSwatch:last-child,
1646 GtkColorSwatch:last-child .overlay {
1647@@ -1248,11 +1433,14 @@
1648 border-bottom-right-radius: 4px;
1649 }
1650
1651+colorswatch:only-child,
1652+colorswatch:only-child .overlay,
1653 GtkColorSwatch:only-child,
1654 GtkColorSwatch:only-child .overlay {
1655 border-radius: 4px;
1656 }
1657
1658+colorswatch:hover,
1659 GtkColorSwatch:hover {
1660 background-image: linear-gradient(135deg,
1661 alpha (#fff, 0.7),
1662@@ -1262,12 +1450,16 @@
1663 box-shadow: inset 0 0 alpha (#fff, 0.4);
1664 }
1665
1666+colorswatch:backdrop,
1667+colorswatch:backdrop:selected,
1668 GtkColorSwatch:backdrop,
1669 GtkColorSwatch:backdrop:selected {
1670 background-image: none;
1671 box-shadow: none;
1672 }
1673
1674+colorswatch:selected,
1675+colorswatch:hover:selected,
1676 GtkColorSwatch:selected,
1677 GtkColorSwatch:hover:selected {
1678 color: #fff;
1679@@ -1289,9 +1481,10 @@
1680 box-shadow: none;
1681 }
1682
1683+colorswatch#add-color-button,
1684 GtkColorSwatch#add-color-button {
1685- text-shadow: 0 1px alpha (#fff, 0.4);
1686- icon-shadow: 0 1px alpha (#fff, 0.4);
1687+ text-shadow: 0 1px @text_shadow_color;
1688+ icon-shadow: 0 1px @text_shadow_color;
1689
1690 background-image: linear-gradient(to bottom,
1691 transparent,
1692@@ -1311,6 +1504,7 @@
1693 transition: all 100ms ease-in;
1694 }
1695
1696+colorswatch#add-color-button .overlay,
1697 GtkColorSwatch#add-color-button .overlay {
1698 border-color: transparent;
1699 background-color: transparent;
1700@@ -1331,6 +1525,8 @@
1701 *********/
1702
1703 /* Middle button */
1704+.linked entry,
1705+.linked button,
1706 .linked .entry,
1707 .linked .button {
1708 border-left-width: 0;
1709@@ -1338,6 +1534,8 @@
1710 }
1711
1712 /* Leftmost button */
1713+.linked entry:first-child,
1714+.linked button:first-child,
1715 .linked .entry:first-child,
1716 .linked .button:first-child,
1717 .linked > GtkComboBox:first-child > .button {
1718@@ -1349,6 +1547,8 @@
1719 }
1720
1721 /* Rightmost button */
1722+.linked entry:last-child,
1723+.linked button:last-child,
1724 .linked .entry:last-child,
1725 .linked .button:last-child,
1726 .linked > GtkComboBox:last-child > .button {
1727@@ -1360,6 +1560,8 @@
1728 }
1729
1730 /* Linked single button */
1731+.linked entry:only-child,
1732+.linked button:only-child,
1733 .linked .entry:only-child,
1734 .linked .button:only-child {
1735 border-right-width: 1px;
1736@@ -1368,6 +1570,8 @@
1737 }
1738
1739 /* Middle button (vertical) */
1740+.linked.vertical entry,
1741+.linked.vertical button,
1742 .linked.vertical .entry,
1743 .linked.vertical .button {
1744 border-left-width: 1px;
1745@@ -1376,12 +1580,16 @@
1746 }
1747
1748 /* Top button (vertical) */
1749+.linked.vertical entry:first-child,
1750+.linked.vertical button:first-child,
1751 .linked.vertical .entry:first-child,
1752 .linked.vertical .button:first-child {
1753 border-radius: 2.5px 2.5px 0 0;
1754 }
1755
1756 /* Bottom button (vertical) */
1757+.linked.vertical entry:last-child,
1758+.linked.vertical button:last-child,
1759 .linked.vertical .entry:last-child,
1760 .linked.vertical .button:last-child {
1761 border-bottom-width: 1px;
1762@@ -1389,6 +1597,8 @@
1763 }
1764
1765 /* Linked single button (vertical) */
1766+.linked.vertical entry:only-child,
1767+.linked.vertical button:only-child,
1768 .linked.vertical .entry:only-child,
1769 .linked.vertical .button:only-child {
1770 border-top-width: 1px;
1771@@ -1400,22 +1610,25 @@
1772 * Notebook and Tabs *
1773 ********************/
1774
1775+notebook,
1776 .notebook {
1777 border-radius: 0 0 2.5px 2.5px;
1778
1779 background-clip: border-box;
1780 background-color: shade (@titlebar_color, 1.06);
1781
1782- text-shadow: 0 1px alpha (#fff, 0.4);
1783- icon-shadow: 0 1px alpha (#fff, 0.4);
1784+ text-shadow: 0 1px @text_shadow_color;
1785+ icon-shadow: 0 1px @text_shadow_color;
1786 border: 1px solid shade (@titlebar_color, 0.70);
1787 }
1788
1789+notebook header,
1790 .notebook.header {
1791 border: none;
1792 background-color: @bg_color;
1793 }
1794
1795+.dynamic-notebook notebook header,
1796 .dynamic-notebook .notebook.header {
1797 background-image: linear-gradient(to bottom,
1798 alpha (#000, 0.10),
1799@@ -1431,6 +1644,7 @@
1800 border-radius: 0;
1801 }
1802
1803+.dynamic-notebook notebook header:backdrop,
1804 .dynamic-notebook .notebook.header:backdrop {
1805 background-color: shade (@titlebar_color, 0.96);
1806 background-image: linear-gradient(to bottom,
1807@@ -1441,19 +1655,23 @@
1808 border-color: shade (@titlebar_color, 0.70);
1809 }
1810
1811+.dynamic-notebook notebook,
1812 .dynamic-notebook .notebook {
1813 -GtkNotebook-tab-overlap: 1px;
1814 border-width: 0;
1815 }
1816
1817+.dynamic-notebook image,
1818 .dynamic-notebook GtkImage {
1819 color: shade (@title_color, 0.75);
1820 }
1821
1822+.dynamic-notebook image:insensitive,
1823 .dynamic-notebook GtkImage:insensitive {
1824 color: @insensitive_color;
1825 }
1826
1827+notebook tab,
1828 .notebook tab {
1829 background-image: linear-gradient(to bottom,
1830 shade (@titlebar_color, 0.79),
1831@@ -1468,6 +1686,7 @@
1832
1833 }
1834
1835+notebook tab:active,
1836 .notebook tab:active {
1837 background-image: linear-gradient(to bottom,
1838 shade (@titlebar_color, 1.12),
1839@@ -1478,6 +1697,7 @@
1840 color: @text_color;
1841 }
1842
1843+.dynamic-notebook notebook tab,
1844 .dynamic-notebook .notebook tab {
1845 padding: 3px;
1846
1847@@ -1494,10 +1714,12 @@
1848 ) 0 1 0 0;
1849 }
1850
1851+.dynamic-notebook notebook tab > image,
1852 .dynamic-notebook .notebook tab > GtkImage {
1853 color: shade (@titlebar_color, 0.35);
1854 }
1855
1856+.dynamic-notebook notebook tab:first-child,
1857 .dynamic-notebook .notebook tab:first-child {
1858 border-width: 0 1px 0 1px;
1859 border-image: linear-gradient(to bottom,
1860@@ -1507,6 +1729,7 @@
1861 }
1862
1863
1864+.dynamic-notebook notebook tab:active,
1865 .dynamic-notebook .notebook tab:active {
1866 background-image: linear-gradient(to bottom,
1867 shade (@titlebar_color, 0.88),
1868@@ -1517,10 +1740,10 @@
1869 border-style: solid;
1870 border-width: 0 1px 1px;
1871
1872- text-shadow: 0 1px alpha (#fff, 0.4);
1873- icon-shadow: 0 1px alpha (#fff, 0.4);
1874+ text-shadow: 0 1px @text_shadow_color;
1875+ icon-shadow: 0 1px @text_shadow_color;
1876
1877- box-shadow: inset 0 0 0 1px alpha (#fff, 0.20),
1878+ box-shadow: inset 0 0 0 1px alpha (@bg_highlight_color, 0.20),
1879 0 0 1px 1px alpha (#000, 0.10);
1880
1881 border-image: none;
1882@@ -1528,29 +1751,32 @@
1883 color: @text_color;
1884 }
1885
1886+.dynamic-notebook notebook tab:active:backdrop,
1887 .dynamic-notebook .notebook tab:active:backdrop {
1888 background-image: linear-gradient(to bottom,
1889 shade (@titlebar_color, 0.98),
1890 shade (@titlebar_color, 0.96)
1891 );
1892 border-color: shade (@titlebar_color, 0.70);
1893- box-shadow: inset 0 0 0 1px alpha (#fff, 0.20),
1894+ box-shadow: inset 0 0 0 1px alpha (@bg_highlight_color, 0.20),
1895 0 0 0 1px alpha (#000, 0.10);
1896 }
1897
1898+notebook header,
1899 .notebook.header {
1900 border: none;
1901 background-color: transparent;
1902 }
1903
1904+notebook,
1905 .notebook {
1906 border-radius: 2.5px;
1907
1908 background-clip: border-box;
1909 background-color: shade (@titlebar_color, 1.06);
1910
1911- text-shadow: 0 1px alpha (#fff, 0.4);
1912- icon-shadow: 0 1px alpha (#fff, 0.4);
1913+ text-shadow: 0 1px @text_shadow_color;
1914+ icon-shadow: 0 1px @text_shadow_color;
1915 border: none;
1916 }
1917
1918@@ -1558,6 +1784,7 @@
1919 border: 1px solid shade (@titlebar_color, 0.60);
1920 }
1921
1922+notebook viewport,
1923 .notebook GtkViewport {
1924 background-color: @base_color;
1925 border-width : 0;
1926@@ -1620,20 +1847,21 @@
1927 color: mix(@text_color, @bg_color, 0.3);
1928 }
1929
1930+combobox entry:first-child,
1931+combobox button:first-child:not(:only-child),
1932 GtkComboBox.combobox-entry .entry:first-child,
1933 GtkComboBox.combobox-entry .button:first-child {
1934 border-radius: 2.5px 0 0 2.5px;
1935 border-right-width: 0;
1936 }
1937
1938+combobox entry:last-child,
1939+combobox button:last-child:not(:only-child),
1940 GtkComboBox.combobox-entry .entry:last-child,
1941 GtkComboBox.combobox-entry .button:last-child {
1942 border-radius: 0 2.5px 2.5px 0;
1943 border-left-width: 0;
1944-}
1945
1946-GtkComboBox.combobox-entry .entry:last-child,
1947-GtkComboBox.combobox-entry .button:last-child {
1948 background-image: linear-gradient(to bottom,
1949 shade (@base_color, 0.93),
1950 shade (@base_color, 0.97)
1951@@ -1641,7 +1869,7 @@
1952
1953 box-shadow: inset 0 1px 0 0 alpha (@inset_dark_color, 0.7),
1954 inset 0 0 0 1px alpha (@inset_dark_color, 0.3),
1955- 0 1px 0 0 alpha (#fff, 0.30);
1956+ 0 1px 0 0 alpha (@bg_highlight_color, 0.30);
1957 }
1958
1959 .toolbar GtkComboBox.combobox-entry .entry:last-child,
1960@@ -1656,13 +1884,14 @@
1961 );
1962
1963 box-shadow: inset 0 0 0 1px @inset_dark_color,
1964- 0 1px 0 0 alpha (#fff, 0.30);
1965+ 0 1px 0 0 alpha (@bg_highlight_color, 0.30);
1966 }
1967
1968 /*************
1969 * Scrollbars *
1970 *************/
1971
1972+scrollbar,
1973 .scrollbar {
1974 background-image: none;
1975 -GtkRange-trough-border: 1;
1976@@ -1687,11 +1916,13 @@
1977 background-color: transparent;
1978 }
1979
1980+scrollbar.overlay-indicator slider,
1981 .scrollbar.slider,
1982 .scrollbar.button {
1983 border: 1px solid alpha (@bg_highlight_color, 0.25);
1984 background-color: alpha (@text_color, 0.6);
1985 border-radius: 10px;
1986+ -GtkRange-slider-width: 5;
1987 }
1988
1989 .scrollbar.slider:insensitive {
1990@@ -1725,17 +1956,13 @@
1991 text-shadow: none;
1992 }
1993
1994+menu,
1995 .content-view .menu,
1996 .menu,
1997 .popup {
1998 padding: 4px 0;
1999 border-radius: 4px;
2000- background-color: transparent;
2001- background-image: linear-gradient(to bottom,
2002- alpha (@bg_color, 0.98),
2003- alpha (@bg_color, 0.98) 80%,
2004- alpha (shade(@bg_color, 0.94), 0.98)
2005- );
2006+ background-color: @bg_color;
2007 box-shadow: inset 0 0 0 1px alpha (@bg_highlight_color, 0.10),
2008 inset 0 1px 0 0 alpha (@bg_highlight_color, 0.90),
2009 inset 0 -1px 0 0 alpha (@bg_highlight_color, 0.30);
2010@@ -1745,16 +1972,20 @@
2011 background-image: none;
2012 }
2013
2014+menubar,
2015 .menubar {
2016 color: @text_color;
2017 background-color: @titlebar_color;
2018 -GtkWidget-window-dragging: true;
2019 }
2020
2021+menubar menuitem,
2022 .menubar .menuitem {
2023 padding: 3px 6px;
2024 }
2025
2026+menu menuitem,
2027+popover .menuitem,
2028 .menu .menuitem,
2029 .popover .menuitem {
2030 padding: 6px;
2031@@ -1763,14 +1994,25 @@
2032 border-width: 1px 0;
2033 }
2034
2035+popover .menuitem,
2036+popover .menuitem:insensitive {
2037+ background-image: none;
2038+ border-color: transparent;
2039+ box-shadow: none;
2040+}
2041+
2042+menu menuitem arrow,
2043 .menu .menuitem.arrow {
2044 -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
2045 }
2046
2047+menu menuitem arrow:dir(rtl),
2048 .menu .menuitem.arrow:dir(rtl) {
2049 -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
2050 }
2051
2052+menu menuitem label,
2053+menu menuitem image,
2054 .menu .menuitem GtkLabel,
2055 .menu .menuitem GtkImage,
2056 .popover .menuitem GtkLabel,
2057@@ -1779,6 +2021,17 @@
2058 -gtk-icon-style: symbolic;
2059 }
2060
2061+popover .menuitem label,
2062+popover .menuitem image {
2063+ padding: 3px;
2064+}
2065+
2066+menu menuitem:active,
2067+menu menuitem:hover,
2068+popup .menuitem:active,
2069+popup .menuitem:hover,
2070+popover .menuitem:active,
2071+popover .menuitem:hover,
2072 .menu .menuitem:active,
2073 .menu .menuitem:hover,
2074 .popup .menuitem:active,
2075@@ -1788,6 +2041,7 @@
2076 background-color: alpha (@text_color, 0.15);
2077 }
2078
2079+popover .menuitem *:insensitive,
2080 .menu .menuitem *:insensitive,
2081 .popover .menuitem *:insensitive {
2082 color: @insensitive_color;
2083@@ -1808,11 +2062,13 @@
2084
2085 /*Moved titlebar sep here to fix seps in titlebar menus*/
2086
2087+.titlebar separator,
2088 .titlebar .separator {
2089 color: transparent;
2090 border: none;
2091 }
2092
2093+menu separator,
2094 .menuitem.separator {
2095 color: @menu_separator;
2096 padding: 4px 0;
2097@@ -1822,6 +2078,11 @@
2098 border-bottom: 1px solid @menu_separator_shadow;
2099 }
2100
2101+menu separator {
2102+ background-color: transparent;
2103+ background-image: none;
2104+}
2105+
2106 .menuitem.check,
2107 .menuitem.radio,
2108 .menuitem.check:active,
2109@@ -1839,10 +2100,14 @@
2110 * Check and Radio items *
2111 *************************/
2112
2113+check,
2114+radio,
2115+check:insensitive,
2116+radio:insensitive ,
2117 .check,
2118-.radio,
2119+GtkRadioButton.radio,
2120 .check:insensitive,
2121-.radio:insensitive {
2122+GtkRadioButton.radio:insensitive {
2123 background-color: transparent;
2124 border-style: none;
2125 }
2126@@ -1854,24 +2119,28 @@
2127 background-color: transparent;
2128 }
2129
2130+check,
2131 .check {
2132 -gtk-icon-source: -gtk-scaled(url("assets/check.svg"),url("assets/check@2.svg"));
2133 background-repeat: no-repeat;
2134 background-position: center;
2135 }
2136
2137+check:focus,
2138 .check:focus {
2139 -gtk-icon-source: -gtk-scaled(url("assets/check-focus.svg"),url("assets/check-focus@2.svg"));
2140 background-repeat: no-repeat;
2141 background-position: center;
2142 }
2143
2144+radio,
2145 .radio {
2146 -gtk-icon-source: -gtk-scaled(url("assets/radio.svg"),url("assets/radio@2.svg"));
2147 background-repeat: no-repeat;
2148 background-position: center;
2149 }
2150
2151+radio:focus,
2152 .radio:focus {
2153 -gtk-icon-source: -gtk-scaled(url("assets/radio-focus.svg"),url("assets/radio-focus@2.svg"));
2154 background-repeat: no-repeat;
2155@@ -1883,30 +2152,26 @@
2156 background-image: none;
2157 }
2158
2159-.check:active,
2160+check:checked,
2161 .check:checked,
2162-.menuitem.check:active,
2163 .menuitem.check:checked {
2164 -gtk-icon-source: -gtk-scaled(url("assets/check-active.svg"),url("assets/check-active@2.svg"));
2165 }
2166
2167-.check:active:focus,
2168+check:checked:focus,
2169 .check:checked:focus,
2170-.menuitem.check:active:focus,
2171 .menuitem.check:checked:focus {
2172 -gtk-icon-source: -gtk-scaled(url("assets/check-active-focus.svg"),url("assets/check-active-focus@2.svg"));
2173 }
2174
2175-.radio:active,
2176+radio:checked,
2177 .radio:checked,
2178-.menuitem.radio:active,
2179 .menuitem.radio:checked {
2180 -gtk-icon-source: -gtk-scaled(url("assets/radio-active.svg"),url("assets/radio-active@2.svg"));
2181 }
2182
2183-.radio:active:focus,
2184+radio:checked:focus,
2185 .radio:checked:focus,
2186-.menuitem.radio:active:focus,
2187 .menuitem.radio:checked:focus {
2188 -gtk-icon-source: -gtk-scaled(url("assets/radio-active-focus.svg"),url("assets/radio-active-focus@2.svg"));
2189 }
2190@@ -1916,6 +2181,7 @@
2191 * Toolbars *
2192 ***********/
2193
2194+toolbar,
2195 GtkHandleBox,
2196 .toolbar {
2197 -GtkWidget-window-dragging: true;
2198@@ -1936,6 +2202,7 @@
2199 icon-shadow: 0 1px alpha (@bg_highlight_color, 0.4);
2200 }
2201
2202+toolbar:backdrop,
2203 GtkHandleBox:backdrop,
2204 .toolbar:backdrop {
2205 background-image: linear-gradient(to bottom,
2206@@ -1949,6 +2216,7 @@
2207 -gtk-image-effect: dim;
2208 }
2209
2210+toolbar separator,
2211 .toolbar .separator {
2212 -GtkWidget-wide-separators: true;
2213 -GtkWidget-horizontal-separator: 0;
2214@@ -1959,6 +2227,7 @@
2215 * Secondary Toolbars *
2216 *********************/
2217
2218+toolbar.secondary-toolbar,
2219 .secondary-toolbar.toolbar {
2220 border-width: 0 0 1px;
2221 border-style: solid;
2222@@ -1979,6 +2248,7 @@
2223 icon-shadow: 0 1px alpha (@bg_highlight_color, 0.4);
2224 }
2225
2226+toolbar.secondary-toolbar:backdrop,
2227 .secondary-toolbar.toolbar:backdrop {
2228 background-image: linear-gradient(to bottom,
2229 shade (@titlebar_color, 0.98),
2230@@ -1991,6 +2261,7 @@
2231 -gtk-image-effect: dim;
2232 }
2233
2234+toolbar.secondary-toolbar button,
2235 .secondary-toolbar.toolbar .button {
2236 border-color: alpha (#000, 0.3);
2237
2238@@ -2003,6 +2274,7 @@
2239 * Bottom Toolbars *
2240 ******************/
2241
2242+toolbar.bottom-toolbar,
2243 .bottom-toolbar.toolbar {
2244 padding: 8px;
2245
2246@@ -2018,6 +2290,7 @@
2247 inset 0 -1px 0 0 alpha (@bg_highlight_color, 0.20);
2248 }
2249
2250+toolbar.bottom-toolbar button,
2251 .bottom-toolbar.toolbar .button {
2252 padding: 2px 3px 2px 3px;
2253 }
2254@@ -2026,6 +2299,7 @@
2255 * Header Bars *
2256 **************/
2257
2258+headerbar button.image-button,
2259 .header-bar .button.image-button {
2260 padding: 3px;
2261 border: 1px solid transparent;
2262@@ -2033,12 +2307,25 @@
2263 box-shadow: none;
2264 }
2265
2266-
2267+.titlebar button.flat,
2268+.titlebar button.image-button,
2269 .titlebar .button.flat,
2270-.titlebar .button.image-button { /* FIXME: This is a workaround for Files */
2271+.titlebar .button.image-button {
2272 border-radius: 50%;
2273 }
2274
2275+.titlebar button.image-button:active,
2276+.titlebar button.image-button:hover:active,
2277+.titlebar button.image-button:focus:active,
2278+.titlebar button.image-button:checked,
2279+.titlebar button.image-button:hover:checked,
2280+.titlebar button.image-button:focus:checked,
2281+.titlebar button.flat:active,
2282+.titlebar button.flat:hover:active,
2283+.titlebar button.flat:focus:active,
2284+.titlebar button.flat:checked,
2285+.titlebar button.flat:hover:checked,
2286+.titlebar button.flat:focus:checked,
2287 .titlebar .button.image-button:active,
2288 .titlebar .button.image-button:hover:active,
2289 .titlebar .button.image-button:focus:active,
2290@@ -2056,17 +2343,22 @@
2291 box-shadow: none;
2292 }
2293
2294+toolbar button.image-button image,
2295 .toolbar .button.image-button GtkImage {
2296 color: shade (@title_color, 0.75);
2297 icon-shadow: 0 1px @title_shadow_color;
2298 }
2299
2300+.titlebar button.image-button image:insensitive,
2301+toolbar button.image-button image:insensitive,
2302 .titlebar .button.image-button GtkImage:insensitive,
2303 .toolbar .button.image-button GtkImage:insensitive {
2304 color: @insensitive_color;
2305 -gtk-image-effect: dim;
2306 }
2307
2308+.titlebar button.image-button image:backdrop,
2309+toolbar button.image-button image:backdrop,
2310 .titlebar .button.image-button GtkImage:backdrop,
2311 .toolbar .button.image-button GtkImage:backdrop {
2312 color: shade (@titlebar_color, 0.80);
2313@@ -2077,6 +2369,7 @@
2314 * Action bars *
2315 ***************/
2316
2317+actionbar,
2318 .action-bar {
2319 padding: 1px 6px;
2320
2321@@ -2134,6 +2427,7 @@
2322 * Inline Toolbars *
2323 ******************/
2324
2325+toolbar.inline-toolbar,
2326 .inline-toolbar.toolbar {
2327
2328 border-radius: 0;
2329@@ -2151,6 +2445,7 @@
2330 inset 0 -1px 0 0 @inset_dark_color;
2331 }
2332
2333+paned toolbar.inline-toolbar,
2334 GtkPaned .inline-toolbar.toolbar {
2335 border-width: 1px 0 0 0;
2336 }
2337@@ -2165,6 +2460,7 @@
2338 );
2339 }
2340
2341+toolbar.inline-toolbar button,
2342 .inline-toolbar.toolbar .button {
2343 border-radius: 0;
2344 border-width: 0;
2345@@ -2178,12 +2474,17 @@
2346 color: shade (@text_color, 1.25);
2347 }
2348
2349+toolbar.inline-toolbar button:active,
2350+toolbar.inline-toolbar button:active:hover,
2351 .inline-toolbar.toolbar .button:active,
2352 .inline-toolbar.toolbar .button:active:hover {
2353 background-color: alpha (#000, 0.05);
2354 background-image: none;
2355 }
2356
2357+toolbar.inline-toolbar button image:insensitive,
2358+toolbar.inline-toolbar button label:insensitive,
2359+toolbar.inline-toolbar button:insensitive,
2360 .inline-toolbar.toolbar .button GtkImage:insensitive,
2361 .inline-toolbar.toolbar .button GtkLabel:insensitive,
2362 .inline-toolbar.toolbar .button:insensitive {
2363@@ -2206,7 +2507,7 @@
2364 * Search bars *
2365 ***************/
2366
2367-EggFindBar.toolbar,
2368+searchbar,
2369 .search-bar {
2370 border-width: 0 0 1px;
2371 border-style: solid;
2372@@ -2227,7 +2528,7 @@
2373 icon-shadow: 0 1px alpha (@bg_highlight_color, 0.4);
2374 }
2375
2376-EggFindBar.toolbar:backdrop,
2377+searchbar:backdrop,
2378 .search-bar:backdrop {
2379 background-image: linear-gradient(to bottom,
2380 shade (@titlebar_color, 0.98),
2381@@ -2260,6 +2561,7 @@
2382 * Suggested Action Button *
2383 **************************/
2384
2385+button.suggested-action,
2386 .suggested-action.button {
2387 background-image: linear-gradient(to bottom,
2388 shade (@selected_bg_color, 1.10),
2389@@ -2274,12 +2576,17 @@
2390 0 1px 0 0 alpha (#fff, 0.15);
2391 }
2392
2393+GtkOverlay button.suggested-action,
2394 GtkOverlay .suggested-action.button {
2395 background-image: none;
2396 background-color: @selected_bg_color;
2397 border-color: @selected_bg_color;
2398 }
2399
2400+button.suggested-action label,
2401+button.suggested-action label:prelight,
2402+button.suggested-action image,
2403+button.suggested-action image:prelight,
2404 .suggested-action.button GtkLabel,
2405 .suggested-action.button GtkLabel:prelight,
2406 .suggested-action.button GtkImage,
2407@@ -2289,6 +2596,8 @@
2408 icon-shadow: 0 1px alpha (#000, 0.3);
2409 }
2410
2411+button.suggested-action:active,
2412+button.suggested-action:active:hover,
2413 .suggested-action.button:active,
2414 .suggested-action.button:active:hover {
2415 background-image: linear-gradient(to bottom,
2416@@ -2303,6 +2612,8 @@
2417 * Destructive Action Button *
2418 ****************************/
2419
2420+button.destructive-action,
2421+.titlebar button.destructive-action,
2422 .destructive-action.button,
2423 .titlebar .destructive-action.button {
2424 background-image: linear-gradient(to bottom,
2425@@ -2318,6 +2629,8 @@
2426 border-color: shade (@error_color, 0.90);
2427 }
2428
2429+button.destructive-action:backdrop,
2430+.titlebar button.destructive-action:backdrop,
2431 .destructive-action.button:backdrop,
2432 .titlebar .destructive-action.button:backdrop {
2433 background-image: linear-gradient(to bottom,
2434@@ -2327,6 +2640,13 @@
2435 border-color: @error_color;
2436 }
2437
2438+button.destructive-action label,
2439+button.destructive-action label:prelight,
2440+button.destructive-action image,
2441+button.destructive-action image:prelight,
2442+.titlebar button.destructive-action label,
2443+.titlebar button.destructive-action label:prelight,
2444+.titlebar button.destructive-action.image-button image,
2445 .destructive-action.button GtkLabel,
2446 .destructive-action.button Gtklabel:prelight,
2447 .destructive-action.button GtkImage,
2448@@ -2339,6 +2659,8 @@
2449 icon-shadow: 0 1px alpha (#000, 0.2);
2450 }
2451
2452+.titlebar button.destructive-action label:backdrop,
2453+.titlebar button.destructive-action.image-button image:backdrop,
2454 .titlebar .destructive-action.button GtkLabel:backdrop,
2455 .titlebar .destructive-action.button.image-button GtkImage:backdrop {
2456 color: shade (@error_color, 1.90);
2457@@ -2346,6 +2668,10 @@
2458 icon-shadow: none;
2459 }
2460
2461+button.destructive-action:active,
2462+button.destructive-action:active:hover,
2463+.titlebar button.destructive-action:active,
2464+.titlebar button.destructive-action:active:hover,
2465 .destructive-action.button:active,
2466 .destructive-action.button:active:hover,
2467 .titlebar .destructive-action.button:active,
2468@@ -2362,6 +2688,7 @@
2469 * Insensitive Button *
2470 **********************/
2471
2472+button:insensitive,
2473 .button:insensitive,
2474 .destructive-action.button:insensitive,
2475 .suggested-action.button:insensitive {
2476@@ -2371,6 +2698,7 @@
2477 color: @insensitive_color;
2478 }
2479
2480+toolbar button:insensitive,
2481 .toolbar .button:insensitive,
2482 .toolbar .destructive-action.button:insensitive,
2483 .titlebar .destructive-action.button:insensitive,
2484@@ -2384,15 +2712,19 @@
2485 color: @insensitive_color;
2486 }
2487
2488+button:insensitive image,
2489+button:insensitive label,
2490 .destructive-action.button:insensitive GtkLabel,
2491 .destructive-action.button:insensitive GtkImage,
2492 .suggested-action.button:insensitive GtkLabel,
2493 .suggested-action.button:insensitive GtkImage {
2494- text-shadow: 0 1px alpha (#fff, 0.4);
2495- icon-shadow: 0 1px alpha (#fff, 0.4);
2496+ text-shadow: 0 1px @text_shadow_color;
2497+ icon-shadow: 0 1px @text_shadow_color;
2498 color: @insensitive_color;
2499 }
2500
2501+spinbutton button:insensitive,
2502+spinbutton button:focus:insensitive,
2503 .spinbutton .button:insensitive,
2504 .spinbutton .button:focus:insensitive {
2505 background-color: alpha (#000, 0.02);
2506@@ -2400,6 +2732,7 @@
2507 color: @insensitive_color;
2508 }
2509
2510+button:active:insensitive,
2511 .button:active:insensitive {
2512 background-image: linear-gradient(to bottom,
2513 shade (@bg_color, 0.85),
2514@@ -2411,6 +2744,7 @@
2515 0 1px 0 0 alpha (#fff, 0.30);
2516 }
2517
2518+button.flat:insensitive,
2519 .button.flat:insensitive {
2520 border-color: transparent;
2521 box-shadow: none;
2522@@ -2441,6 +2775,7 @@
2523 * GtkSwitch *
2524 *************/
2525
2526+switch,
2527 GtkSwitch {
2528 font: 1;
2529 -GtkSwitch-slider-width: 24;
2530@@ -2448,6 +2783,7 @@
2531 transition: all 200ms ease-in;
2532 }
2533
2534+switch,
2535 GtkSwitch.trough {
2536 background-color: alpha (#000, 0.10);
2537 background-image: none;
2538@@ -2460,6 +2796,7 @@
2539 color: transparent;
2540 }
2541
2542+switch:active,
2543 GtkSwitch.trough:active {
2544 background-image: linear-gradient(to bottom,
2545 shade (@colorAccent, 1.20),
2546@@ -2469,22 +2806,26 @@
2547 border-color: shade (@colorAccent, 0.85);
2548 }
2549
2550+switch:insensitive,
2551 GtkSwitch.trough:insensitive {
2552 background-color: alpha (#000, 0.02);
2553 }
2554
2555+switch:active:insensitive,
2556 GtkSwitch.trough:active:insensitive {
2557 background-image: none;
2558 background-color: mix (@bg_color, @colorAccent, 0.5);
2559 border-color: shade (mix (@bg_color, @colorAccent, 0.5), 0.75);
2560 }
2561
2562+switch:active:backdrop,
2563 GtkSwitch.trough:active:backdrop {
2564 background-image: none;
2565 background-color: shade (@bg_color, 0.8);
2566 border-color: shade (@bg_color, 0.65);
2567 }
2568
2569+switch slider,
2570 GtkSwitch.slider {
2571 background-image: linear-gradient(to bottom,
2572 shade (@bg_color, 1.05),
2573@@ -2501,6 +2842,7 @@
2574 0 1px 2px alpha (#000, 0.16);
2575 }
2576
2577+switch:focus slider,
2578 GtkSwitch.slider:focus {
2579 background-image: linear-gradient(to bottom,
2580 shade (@bg_color, 1.05),
2581@@ -2514,6 +2856,8 @@
2582 0 1px 2px alpha (@colorAccent, 0.16);
2583 }
2584
2585+switch slider:insensitive,
2586+switch slider:backdrop,
2587 GtkSwitch.slider:insensitive,
2588 GtkSwitch.slider:backdrop {
2589 background-image: none;
2590@@ -2641,6 +2985,7 @@
2591 * Column Headers *
2592 *****************/
2593
2594+treeview header button,
2595 column-header .button {
2596 border-left-width: 0;
2597 border-top-width: 0;
2598@@ -2655,10 +3000,12 @@
2599 padding: 4px 2px 4px 2px;
2600 }
2601
2602+treeview header button:last-child,
2603 column-header:last-child .button {
2604 border-right-width: 0;
2605 }
2606
2607+treeview header button:hover,
2608 column-header .button:hover {
2609 background-image: linear-gradient(to bottom,
2610 shade (@base_color, 0.80),
2611@@ -2666,10 +3013,12 @@
2612 );
2613 }
2614
2615+treeview header button:backdrop,
2616 column-header .button:backdrop {
2617 background-image: none;
2618 }
2619
2620+treeview header button:backdrop:hover,
2621 column-header .button:backdrop:hover {
2622 background-image: linear-gradient(to bottom,
2623 shade (@bg_color, 0.92),
2624@@ -2677,11 +3026,13 @@
2625 );
2626 }
2627
2628+treeview header button label,
2629 column-header .button GtkLabel {
2630 padding-left: 3px;
2631 color: shade (@text_color, 1.8);
2632 }
2633
2634+treeview header button:backdrop label,
2635 column-header .button:backdrop GtkLabel {
2636 color: shade (@text_color, 2.8);
2637 }
2638@@ -2690,22 +3041,24 @@
2639 * List Boxes *
2640 *************/
2641
2642-EggListBox,
2643+list,
2644 GtkListBox,
2645 .list {
2646 background-color: @base_color;
2647 }
2648
2649-.popover EggListBox,
2650+popover list,
2651 .popover GtkListBox,
2652 .popover .list {
2653 background-color: transparent;
2654 }
2655
2656+list row,
2657 .list-row {
2658 border-color: @border_color;
2659 }
2660
2661+list row,
2662 .list-row.button {
2663 background-image: none;
2664 border: none;
2665@@ -2713,11 +3066,14 @@
2666 box-shadow: none;
2667 }
2668
2669+list row:selected button,
2670 .list-row:selected:focus .button {
2671 background-color: @bg_color;
2672 transition: none;
2673 }
2674
2675+list row:selected,
2676+list row:selected:backdrop,
2677 .list-row:selected,
2678 .list-row:selected:backdrop {
2679 background-color: shade (@base_color, 0.80);
2680@@ -2726,6 +3082,8 @@
2681 text-shadow: none;
2682 }
2683
2684+list row:selected:focus,
2685+list row:selected:focus image,
2686 .list-row:selected:focus,
2687 .list-row:selected:focus GtkImage {
2688 background-color: @colorAccent;
2689@@ -2742,6 +3100,7 @@
2690 }
2691
2692 .content-view,
2693+.content-view viewport,
2694 .content-view GtkViewport {
2695 background-color: transparent;
2696 background-image: none;
2697@@ -2770,7 +3129,7 @@
2698 .content-view .subtitle,
2699 .content-view .option-description {
2700 color: alpha (@text_color, 0.5);
2701- text-shadow: 0 1px alpha (#fff, 0.4);
2702+ text-shadow: 0 1px @text_shadow_color;
2703 }
2704
2705 .content-view .toolbar {
2706@@ -2789,80 +3148,57 @@
2707 ************************/
2708
2709 .sidebar,
2710-.sidebar .view,
2711-.sidebar GtkScrolledWindow,
2712+.sidebar.view,
2713+.sidebar list,
2714+.sidebar GtkList,
2715 .source-list,
2716 .source-list.view {
2717 background-color: shade (@bg_color, 0.92);
2718- color: shade (@titlebar_color, 0.50);
2719+ color: mix (@titlebar_color, @text_color, 0.60);
2720 -gtk-icon-style: regular;
2721-}
2722-
2723-.popover .sidebar:backdrop {
2724- color: shade (@titlebar_color, 0.50);
2725-}
2726-
2727-.sidebar .separator {
2728- color: transparent;
2729-}
2730-
2731+ -GtkTreeView-horizontal-separator: 1px;
2732+ -GtkTreeView-vertical-separator: 6px;
2733+}
2734+
2735+dialog .sidebar,
2736+dialog .sidebar list,
2737+dialog .source-list,
2738 GtkDialog .sidebar,
2739-GtkDialog .sidebar .view,
2740-GtkDialog .sidebar GtkScrolledWindow {
2741+GtkDialog .sidebar GtkList,
2742+GtkDialog .source-list {
2743 background-color: shade (@titlebar_color, 1.07);
2744 }
2745
2746-.sidebar,
2747-.sidebar .view,
2748-.sidebar .view:selected:backdrop,
2749-.sidebar .view:hover:selected:backdrop,
2750-.sidebar-row,
2751-.sidebar-row:selected:backdrop,
2752-.sidebar-row:hover:selected:backdrop,
2753-.source-list,
2754-.source-list.view,
2755-.source-list.view:selected:backdrop,
2756-.source-list.view:hover:selected:backdrop {
2757- text-shadow: 0 1px alpha (#fff, 0.4);
2758- icon-shadow: 0 1px alpha (#fff, 0.4);
2759- border-color: transparent;
2760- border-style: solid;
2761- border-width: 1px 0 1px 0;
2762-}
2763-
2764-.sidebar,
2765-.source-list {
2766- -GtkTreeView-horizontal-separator: 1px;
2767- -GtkTreeView-vertical-separator: 6px;
2768-}
2769-
2770 .sidebar-row {
2771 padding: 0 6px;
2772 }
2773
2774+.sidebar-row image,
2775 .sidebar-row GtkImage {
2776 padding-right: 6px;
2777 }
2778
2779+.sidebar .view,
2780+.sidebar-row,
2781+.source-list .view {
2782+ border-color: transparent;
2783+ border-style: solid;
2784+ border-width: 1px 0 1px 0;
2785+ text-shadow: 0 1px @text_shadow_color;
2786+}
2787+
2788 .sidebar .view:hover,
2789 .sidebar-row:hover,
2790-.source-list.view:hover {
2791+.source-list .view:hover {
2792 background-color: shade (@titlebar_color, 1.10);
2793 }
2794
2795+.popover .sidebar.view:selected,
2796 .sidebar .view:selected,
2797-.sidebar .view:selected:hover,
2798-.sidebar.view:selected,
2799-.sidebar.view:selected:hover,
2800 .sidebar-row:selected,
2801-.sidebar-row:selected:hover,
2802-.sidebar-row:selected:focus,
2803-.popover .sidebar.view:selected,
2804-.source-list.view:selected,
2805-.source-list.view:selected:hover,
2806-.source-list.view:selected:focus,
2807+.source-list .view:selected,
2808 .source-list.category-expander:hover {
2809- color: shade (@titlebar_color, 0.50);
2810+ color: mix (@titlebar_color, @text_color, 0.60);
2811
2812 background-color: transparent;
2813 background-image: linear-gradient(to bottom,
2814@@ -2872,40 +3208,52 @@
2815
2816 border-image: linear-gradient(to bottom,
2817 alpha (#000, 0.25),
2818- alpha (#fff, 0.30)
2819+ alpha (@bg_highlight_color, 0.30)
2820 ) 1 1 1 1;
2821
2822 box-shadow: inset 0 1px 0 0 alpha (#000, 0.03),
2823 inset 0 -1px 0 0 alpha (#000, 0.10);
2824 }
2825
2826+dialog .sidebar .view:selected,
2827+dialog .sidebar-row:selected,
2828+dialog .sidebar-row:selected:focus,
2829+dialog .source-list .view:selected,
2830 GtkDialog .sidebar .view:selected,
2831 GtkDialog .sidebar-row:selected,
2832-GtkDialog .sidebar .view:hover:selected {
2833+GtkDialog .sidebar-row:selected:focus,
2834+GtkDialog .source-list .view:selected {
2835+ color: mix (@titlebar_color, @text_color, 0.60);
2836 background-image: none;
2837 background-color: alpha (#000, 0.05);
2838
2839 border-image: linear-gradient(to bottom,
2840 alpha (#000, 0.15),
2841- alpha (#fff, 0.30)
2842+ alpha (@bg_highlight_color, 0.30)
2843 ) 1 1 1 1;
2844
2845 box-shadow: inset 0 1px 0 0 alpha (#000, 0.02),
2846 inset 0 -1px 0 0 alpha (#000, 0.10);
2847 }
2848
2849+dialog .sidebar-row:selected:focus image,
2850+GtkDialog .sidebar-row:selected:focus GtkImage {
2851+ background-color: transparent;
2852+}
2853+
2854 .sidebar:backdrop,
2855-.sidebar .view:selected:backdrop,
2856+.sidebar-row:backdrop,
2857+.sidebar .view:backdrop,
2858 .source-list:backdrop,
2859-.source-list.view:selected:backdrop {
2860- color: shade (@titlebar_color, 0.60);
2861+.source-list .view:backdrop {
2862+ color: mix (@titlebar_color, @text_color, 0.40);
2863 -gtk-image-effect: dim;
2864 }
2865
2866 .sidebar .view:selected:backdrop,
2867-.sidebar .view:hover:selected:backdrop,
2868-.source-list.view:selected:backdrop,
2869-.source-list.view:hover:selected:backdrop {
2870+.sidebar-row:selected:backdrop,
2871+.source-list .view:selected:backdrop {
2872+ color: mix (@titlebar_color, @text_color, 0.40);
2873 background-image: linear-gradient(to bottom,
2874 alpha (#000, 0.04),
2875 alpha (#000, 0.03)
2876@@ -2917,8 +3265,12 @@
2877 ) 1 1 1 1;
2878 }
2879
2880+dialog .sidebar .view:selected:backdrop,
2881+dialog .sidebar-row:selected:backdrop,
2882+dialog .source-list .view:selected:backdrop,
2883 GtkDialog .sidebar .view:selected:backdrop,
2884-GtkDialog .sidebar .view:hover:selected:backdrop {
2885+GtkDialog .sidebar-row:selected:backdrop,
2886+GtkDialog .source-list .view:selected:backdrop {
2887 background-color: alpha (#000, 0.05);
2888 background-image: none;
2889
2890@@ -2928,11 +3280,17 @@
2891 ) 1 1 1 1;
2892 }
2893
2894-.sidebar .scrollbar.trough,
2895-.sidebar .scrollbars-junction,
2896-.source-list .scrollbar.trough,
2897-.source-list .scrollbars-junction {
2898- background-color: @titlebar_color;
2899+.sidebar.frame {
2900+ border-width: 1px 0 1px 0;
2901+}
2902+
2903+.sidebar .frame {
2904+ border: none;
2905+}
2906+
2907+.sidebar separator,
2908+.sidebar .separator {
2909+ color: transparent;
2910 }
2911
2912 .source-list.badge,
2913@@ -3016,10 +3374,15 @@
2914 * GtkCalendar *
2915 **************/
2916
2917+calendar,
2918 GtkCalendar {
2919 border-radius: 2px;
2920 }
2921
2922+calendar button,
2923+calendar button:insensitive,
2924+calendar header,
2925+calendar .view,
2926 GtkCalendar.button,
2927 GtkCalendar.button:insensitive,
2928 GtkCalendar.header,
2929@@ -3037,6 +3400,7 @@
2930 * GtkInfoBar *
2931 *************/
2932
2933+infobar,
2934 GtkInfoBar {
2935 border-style: solid;
2936 border-width: 0 0 1px 0;
2937@@ -3044,10 +3408,12 @@
2938 inset 0 -1px 0 0 alpha (#fff, 0.06);
2939 }
2940
2941+infobar label,
2942 GtkInfoBar GtkLabel {
2943 padding: 3px;
2944 }
2945
2946+infobar.info,
2947 GtkInfoBar.info {
2948 background-image: linear-gradient(to bottom,
2949 shade (@bg_color, 1.01),
2950@@ -3060,10 +3426,13 @@
2951 border-color: shade (@bg_color, 0.8);
2952 }
2953
2954+infobar.info label,
2955+infobar.info image,
2956 GtkInfoBar.info GtkLabel {
2957 color: @text_color;
2958 }
2959
2960+infobar.question,
2961 GtkInfoBar.question {
2962 background-image: linear-gradient(to bottom,
2963 shade (@selected_bg_color, 1.30),
2964@@ -3072,10 +3441,13 @@
2965 border-color: shade (@selected_bg_color, 0.9);
2966 }
2967
2968+infobar.question label,
2969+infobar.question image,
2970 GtkInfoBar.question GtkLabel {
2971 color: shade (@selected_bg_color, 0.5);
2972 }
2973
2974+infobar.warning,
2975 GtkInfoBar.warning {
2976 background-image: linear-gradient(to bottom,
2977 shade (@warning_color, 1.30),
2978@@ -3088,10 +3460,13 @@
2979 border-color: shade (@warning_color, 0.8);
2980 }
2981
2982+infobar.warning label,
2983+infobar.warning image,
2984 GtkInfoBar.warning GtkLabel {
2985 color: shade (@warning_color, 0.5);
2986 }
2987
2988+infobar.error,
2989 GtkInfoBar.error {
2990 background-image: linear-gradient(to bottom,
2991 shade (@error_color, 1.30),
2992@@ -3100,26 +3475,33 @@
2993 border-color: shade (@error_color, 0.9);
2994 }
2995
2996+infobar.error label,
2997 GtkInfoBar.error GtkLabel {
2998 color: shade (@error_color, 0.5);
2999 }
3000
3001+infobar label,
3002 GtkInfoBar GtkLabel {
3003 icon-shadow: 0 1px alpha (#fff, 0.3);
3004 text-shadow: 0 1px alpha (#fff, 0.3);
3005 }
3006
3007+infoBar entry,
3008+infoBar menu,
3009 GtkInfoBar .entry,
3010 GtkInfoBar .menu {
3011 color: @text_color;
3012 }
3013
3014-
3015+infobar label:insensitive
3016 GtkInfoBar GtkLabel:insensitive {
3017 color: @insensitive_color;
3018
3019 }
3020
3021+infoBar button,
3022+infoBar button:focus,
3023+.dynamic-notebook infobar button,
3024 GtkInfoBar .button,
3025 GtkInfoBar .button:focus,
3026 .dynamic-notebook GtkInfoBar .button {
3027@@ -3138,6 +3520,8 @@
3028 0 1px 0 0 alpha (#fff, 0.15);
3029 }
3030
3031+infobar button:active,
3032+infobar button:hover:active,
3033 GtkInfoBar .button:active,
3034 GtkInfoBar .button:hover:active {
3035 background-image: none;
3036@@ -3145,6 +3529,8 @@
3037 border-color: alpha (#000, 0.35);
3038 }
3039
3040+infobar button:insensitive,
3041+infobar button:hover:insensitive,
3042 GtkInfoBar .button:insensitive,
3043 GtkInfoBar .button:hover:insensitive {
3044 background-image: none;
3045@@ -3176,6 +3562,8 @@
3046 * Popover *
3047 **********/
3048
3049+popover,
3050+popover.osd,
3051 .popover,
3052 .popover.osd {
3053 border-radius: 4px;
3054@@ -3191,19 +3579,23 @@
3055 text-shadow: none;
3056 }
3057
3058+popover image,
3059 .popover GtkImage {
3060 color: alpha (@text_color, 0.8);
3061 }
3062
3063+popover image:insensitive,
3064 .popover GtkImage:insensitive {
3065 color: @insensitive_color;
3066 }
3067
3068-.popover .view,
3069+popover .view,
3070+popover .sidebar.view,
3071 .popover .view {
3072 background-color: transparent;
3073 }
3074
3075+popover.menu,
3076 .popover.menu {
3077 background-image: none;
3078 }
3079@@ -3228,6 +3620,7 @@
3080 box-shadow: none;
3081 }
3082
3083+popover separator,
3084 .popover .separator {
3085 font-size: 80%;
3086 font-weight: bold;
3087@@ -3310,6 +3703,7 @@
3088 -gtk-image-effect: dim;
3089 }
3090
3091+headerbar.titlebar,
3092 .header-bar {
3093 padding: 8px 6px 6px;
3094 }
3095@@ -3335,9 +3729,11 @@
3096 box-shadow: inset 0 1px 0 0 alpha (@bg_highlight_color, 0.60);
3097 }
3098
3099-GtkDialog .titlebar,
3100+dialog .titlebar.default-decoration,
3101+messagedialog .titlebar,
3102+messagedialog .titlebar.default-decoration,
3103+GtkDialog .titlebar.default-decoration,
3104 GtkMessageDialog .titlebar,
3105-GtkDialog .titlebar.default-decoration,
3106 GtkMessageDialog .titlebar.default-decoration {
3107 border: none;
3108
3109@@ -3349,6 +3745,10 @@
3110 inset 0 1px 0 0 @bg_highlight_color;
3111 }
3112
3113+dialog .titlebar:backdrop,
3114+messagedialog .titlebar:backdrop,
3115+dialog .titlebar.default-decoration:backdrop,
3116+messagedialog .titlebar.default-decoration:backdrop,
3117 GtkDialog .titlebar:backdrop,
3118 GtkMessageDialog .titlebar:backdrop,
3119 GtkDialog .titlebar.default-decoration:backdrop,
3120@@ -3412,6 +3812,7 @@
3121 icon-shadow: none;
3122 }
3123
3124+decoration,
3125 .window-frame {
3126 border-radius: 4px 4px 0 0;
3127
3128@@ -3419,9 +3820,10 @@
3129 0 14px 28px rgba(0,0,0,0.35),
3130 0 10px 10px rgba(0,0,0,0.22);
3131
3132- margin: 8px;
3133+ margin: 12px;
3134 }
3135
3136+.popup decoration,
3137 .window-frame.menu.csd,
3138 .window-frame.popup.csd {
3139 border-radius: 3px;
3140@@ -3431,6 +3833,7 @@
3141 margin: 0;
3142 }
3143
3144+menu .popup decoration,
3145 .menu .window-frame.menu.csd,
3146 .menu .window-frame.popup.csd {
3147 box-shadow: 0 0 0 1px alpha (#000, 0.20),
3148@@ -3438,20 +3841,29 @@
3149 0 6px 6px alpha (#000, 0.23);
3150 }
3151
3152+tooltip decoration {
3153+ border-radius: 3px;
3154+ box-shadow: 0 1px 3px alpha (#000, 0.12),
3155+ 0 1px 2px alpha (#000, 0.24);
3156+ margin: 0;
3157+}
3158+
3159 .window-frame.tooltip.csd {
3160 border-radius: 3px;
3161 box-shadow: none;
3162 margin: 0;
3163 }
3164
3165+decoration:backdrop,
3166 .window-frame:backdrop {
3167 box-shadow: 0 0 0 1px alpha (#000, 0.20),
3168 0 3px 6px alpha (#000, 0.16),
3169- 0 3px 6px alpha (#000, 0.23);
3170+ 0 3px 6px alpha (#000, 0.23),
3171+ 0 14px 28px transparent;
3172 }
3173
3174-GtkDialog.window-frame,
3175-GtkDialog.window-frame:backdrop,
3176+dialog decoration,
3177+dialog decoration:backdrop,
3178 .window-frame.dialog,
3179 .window-frame.dialog:backdrop {
3180 border-radius: 4px;
3181@@ -3471,15 +3883,20 @@
3182 * Dialog *
3183 ***************/
3184
3185+messagedialog decoration,
3186+dialog decoration,
3187 GtkDialog.csd,
3188 GtkMessageDialog.csd {
3189 border-radius: 3px;
3190 }
3191
3192+messagedialog,
3193+dialog,
3194 GtkDialog.background {
3195 border-radius: 0 0 4px 4px;
3196 }
3197
3198+messagedialog,
3199 .prompt,
3200 GtkMessageDialog {
3201 -GtkDialog-button-spacing: 0;
3202@@ -3487,10 +3904,13 @@
3203 -gtk-icon-style: regular;
3204 }
3205
3206+messagedialog button,
3207 GtkMessageDialog .button {
3208 padding: 6px;
3209 }
3210
3211+messagedialog .titlebar,
3212+dialog .titlebar,
3213 GtkDialog .titlebar,
3214 GtkMessageDialog .titlebar {
3215 border: none;
3216@@ -3503,6 +3923,8 @@
3217 inset 0 1px 0 0 @bg_highlight_color;
3218 }
3219
3220+messagedialog .titlebar:backdrop,
3221+dialog .titlebar:backdrop,
3222 GtkDialog .titlebar:backdrop,
3223 GtkMessageDialog .titlebar:backdrop {
3224 border: none;
3225@@ -3517,6 +3939,7 @@
3226 color: shade (@titlebar_color, 1.20);
3227 }
3228
3229+dialog .titlebar .title,
3230 GtkDialog .titlebar .title {
3231 color: transparent;
3232 font-size: 0;
3233@@ -3524,6 +3947,8 @@
3234 icon-shadow: none;
3235 }
3236
3237+messagedialog,
3238+dialog,
3239 GtkDialog,
3240 GtkMessageDialog {
3241 box-shadow: inset 1px 0 0 0 alpha (@bg_highlight_color, 0.20),
3242@@ -3531,6 +3956,7 @@
3243 inset 0 -1px 0 0 alpha (@bg_highlight_color, 0.30);
3244 }
3245
3246+dialog toolbar,
3247 GtkDialog .toolbar {
3248 background-image: none;
3249 background-color: @bg_color;
3250@@ -3547,7 +3973,7 @@
3251 .category-label {
3252 color: mix (@bg_color, @text_color, 0.7);
3253 font-weight: 600;
3254- text-shadow: 0 1px alpha (#fff, 0.6);
3255+ text-shadow: 0 1px @text_shadow_color;
3256 }
3257
3258 .h4 {
3259@@ -3555,6 +3981,7 @@
3260 padding-top: 6px;
3261 }
3262
3263+list .h4,
3264 GtkListBox .h4{
3265 padding-left: 6px;
3266 }
3267@@ -3563,11 +3990,13 @@
3268 opacity: 0.75;
3269 }
3270
3271+image.eror,
3272 GtkImage.error,
3273 .error {
3274 color: @error_color;
3275 }
3276
3277+image.warning,
3278 GtkImage.warning,
3279 .warning {
3280 color: @warning_color;
3281@@ -3577,11 +4006,13 @@
3282 color: shade (@warning_color, 0.75);
3283 }
3284
3285+image.success,
3286 GtkImage.success,
3287 .success {
3288 color: @success_color;
3289 }
3290
3291+label.success,
3292 .label.success {
3293 color: shade (@success_color, 0.75);
3294 }
3295
3296=== modified file 'gtk-3.0/gtk.css'
3297--- gtk-3.0/gtk.css 2015-10-24 16:03:17 +0000
3298+++ gtk-3.0/gtk.css 2015-11-30 16:54:22 +0000
3299@@ -26,7 +26,7 @@
3300 @define-color base_color #FFF;
3301 @define-color bg_color shade (@base_color, 0.96);
3302 @define-color bg_highlight_color #fff;
3303-@define-color border_color alpha (#000, 0.22);
3304+@define-color border_color alpha (#000, 0.25);
3305 @define-color fg_color #333;
3306 @define-color insensitive_color mix(@text_color, @bg_color, 0.6);
3307 @define-color inset_dark_color alpha (#000, 0.06);
3308@@ -38,6 +38,7 @@
3309 @define-color selected_bg_color #3d9bda;
3310 @define-color selected_fg_color #FFF;
3311 @define-color text_color #333;
3312+@define-color text_shadow_color alpha (#fff, 0.4);
3313 @define-color titlebar_color #DEDEDE;
3314 @define-color title_color shade (@titlebar_color, 0.55);
3315 @define-color title_shadow_color alpha (#fff, 0.6);
3316@@ -70,16 +71,6 @@
3317 @define-color orange #ee6221;
3318 @define-color purple #4a58b1;
3319
3320-@define-color info_fg_color rgb (0, 136, 204);
3321-@define-color info_bg_color rgb (252, 252, 189);
3322-@define-color warning_fg_color rgb (173, 120, 41);
3323-@define-color warning_bg_color rgb (250, 173, 61);
3324-@define-color question_fg_color rgb (97, 122, 214);
3325-@define-color question_bg_color rgb (138, 173, 212);
3326-@define-color error_fg_color rgb (166, 38, 38);
3327-@define-color error_bg_color rgb (237, 54, 54);
3328-
3329-
3330 @define-color insensitive_bg_color #f4f4f2;
3331 @define-color insensitive_fg_color #a7aba7;
3332
3333
3334=== modified file 'plank/dock.theme'
3335--- plank/dock.theme 2015-11-18 06:47:42 +0000
3336+++ plank/dock.theme 2015-11-30 16:54:22 +0000
3337@@ -49,7 +49,7 @@
3338 #The time (in ms) to fade the dock in/out on a hide (if FadeOpacity is < 1).
3339 FadeTime=250
3340 #The time (in ms) to slide the dock in/out on a hide (if FadeOpacity is 1).
3341-HideTime=150
3342+HideTime=200
3343 #The size of the urgent glow (shown when dock is hidden), in tenths of a percent of IconSize.
3344 GlowSize=0
3345 #The total time (in ms) to show the hidden-dock urgent glow.

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: