Merge lp:~3v1n0/ubuntu-themes/infobar-default-color into lp:ubuntu-themes

Proposed by Marco Trevisan (Treviño) on 2018-04-21
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2018-04-21
Approved revision: 617
Merged at revision: 624
Proposed branch: lp:~3v1n0/ubuntu-themes/infobar-default-color
Merge into: lp:ubuntu-themes
Diff against target: 137 lines (+60/-0)
2 files modified
Ambiance/gtk-3.20/gtk-widgets.css (+30/-0)
Radiance/gtk-3.20/gtk-widgets.css (+30/-0)
To merge this branch: bzr merge lp:~3v1n0/ubuntu-themes/infobar-default-color
Reviewer Review Type Date Requested Status
Ubuntu Artwork Packagers 2018-04-21 Pending
Review via email: mp+343749@code.launchpad.net

Commit message

Ambiance, Radiance: define color for infobar and implement backdrop state

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ambiance/gtk-3.20/gtk-widgets.css'
2--- Ambiance/gtk-3.20/gtk-widgets.css 2018-03-28 06:27:00 +0000
3+++ Ambiance/gtk-3.20/gtk-widgets.css 2018-04-21 02:03:28 +0000
4@@ -1033,6 +1033,8 @@
5 /***********
6 * infobar *
7 ***********/
8+ infobar,
9+ infobar.info,
10 .info {
11 background-image: -gtk-gradient (linear, left top, left bottom,
12 from (shade (@info_bg_color, 1.04)),
13@@ -1051,6 +1053,14 @@
14 inset 0 -1px shade (@info_bg_color, 1.04);
15 }
16
17+infobar:backdrop,
18+infobar.info:backdrop,
19+.info:backdrop {
20+ background-image: none;
21+ background-color: mix (@info_bg_color, @bg_color, 0.5);
22+}
23+
24+infobar.warning,
25 .warning {
26 background-image: -gtk-gradient (linear, left top, left bottom,
27 from (shade (@warning_bg_color, 1.04)),
28@@ -1069,6 +1079,13 @@
29 inset 0 -1px shade (@warning_bg_color, 1.04);
30 }
31
32+infobar.warning:backdrop,
33+.warning:backdrop {
34+ background-image: none;
35+ background-color: mix (@info_bg_color, @warning_bg_color, 0.5);
36+}
37+
38+infobar.question,
39 .question {
40 background-image: -gtk-gradient (linear, left top, left bottom,
41 from (shade (@question_bg_color, 1.04)),
42@@ -1087,6 +1104,13 @@
43 inset 0 -1px shade (@question_bg_color, 1.04);
44 }
45
46+infobar.question:backdrop,
47+.question:backdrop {
48+ background-image: none;
49+ background-color: mix (@question_bg_color, @bg_color, 0.5);
50+}
51+
52+infobar.error,
53 .error {
54 background-image: -gtk-gradient (linear, left top, left bottom,
55 from (shade (@error_bg_color, 1.04)),
56@@ -1105,6 +1129,12 @@
57 inset 0 -1px shade (@error_bg_color, 1.04);
58 }
59
60+infobar.error:backdrop,
61+.error:backdrop {
62+ background-image: none;
63+ background-color: mix (@error_bg_color, @bg_color, 0.5);
64+}
65+
66 /********
67 * menu *
68 ********/
69
70=== modified file 'Radiance/gtk-3.20/gtk-widgets.css'
71--- Radiance/gtk-3.20/gtk-widgets.css 2018-03-28 06:27:00 +0000
72+++ Radiance/gtk-3.20/gtk-widgets.css 2018-04-21 02:03:28 +0000
73@@ -1038,6 +1038,8 @@
74 /***********
75 * infobar *
76 ***********/
77+ infobar,
78+ infobar.info,
79 .info {
80 background-image: -gtk-gradient (linear, left top, left bottom,
81 from (shade (@info_bg_color, 1.04)),
82@@ -1056,6 +1058,14 @@
83 inset 0 -1px shade (@info_bg_color, 1.04);
84 }
85
86+infobar:backdrop,
87+infobar.info:backdrop,
88+.info:backdrop {
89+ background-image: none;
90+ background-color: mix (@info_bg_color, @bg_color, 0.5);
91+}
92+
93+infobar.warning,
94 .warning {
95 background-image: -gtk-gradient (linear, left top, left bottom,
96 from (shade (@warning_bg_color, 1.04)),
97@@ -1074,6 +1084,13 @@
98 inset 0 -1px shade (@warning_bg_color, 1.04);
99 }
100
101+infobar.warning:backdrop,
102+.warning:backdrop {
103+ background-image: none;
104+ background-color: mix (@info_bg_color, @warning_bg_color, 0.5);
105+}
106+
107+infobar.question,
108 .question {
109 background-image: -gtk-gradient (linear, left top, left bottom,
110 from (shade (@question_bg_color, 1.04)),
111@@ -1092,6 +1109,13 @@
112 inset 0 -1px shade (@question_bg_color, 1.04);
113 }
114
115+infobar.question:backdrop,
116+.question:backdrop {
117+ background-image: none;
118+ background-color: mix (@question_bg_color, @bg_color, 0.5);
119+}
120+
121+infobar.error,
122 .error {
123 background-image: -gtk-gradient (linear, left top, left bottom,
124 from (shade (@error_bg_color, 1.04)),
125@@ -1110,6 +1134,12 @@
126 inset 0 -1px shade (@error_bg_color, 1.04);
127 }
128
129+infobar.error:backdrop,
130+.error:backdrop {
131+ background-image: none;
132+ background-color: mix (@error_bg_color, @bg_color, 0.5);
133+}
134+
135 /********
136 * menu *
137 ********/

Subscribers

People subscribed via source and target branches