Ubuntu theme

Merge lp:~3v1n0/ubuntu-themes/builder-fixes into lp:ubuntu-themes

  1. builder-fixes
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 623
Merged at revision: 618
Proposed branch: lp:~3v1n0/ubuntu-themes/builder-fixes
Merge into: lp:ubuntu-themes
Prerequisite: lp:~3v1n0/ubuntu-themes/theme-colors-definitions
Diff against target: 282 lines (+33/-34)
8 files modified
Ambiance/gtk-3.20/gtk-main.css (+1/-0)
Ambiance/gtk-3.20/gtk-widgets-borders.css (+9/-12)
Ambiance/gtk-3.20/gtk-widgets.css (+7/-7)
Ambiance/gtk-3.20/public-colors.css (+1/-1)
Radiance/gtk-3.20/gtk-main.css (+1/-0)
Radiance/gtk-3.20/gtk-widgets-borders.css (+5/-5)
Radiance/gtk-3.20/gtk-widgets.css (+8/-8)
Radiance/gtk-3.20/public-colors.css (+1/-1)
To merge this branch: bzr merge lp:~3v1n0/ubuntu-themes/builder-fixes
Reviewer Review Type Date Requested Status
Ubuntu Artwork Packagers Pending
Review via email: mp+342964@code.launchpad.net

Commit message

Ambiance, Radiance: fix complex headerbars such as gnome-builder one

To post a comment you must log in.
lp:~3v1n0/ubuntu-themes/builder-fixes updated
622. By Marco Trevisan (Treviño)

Merging again with theme-colors-definitions branch

623. By Marco Trevisan (Treviño)

Ambiance, Radiance: redefine borders based on opacity

In this way it will work fine in both dark and light elements

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-main.css'
2--- Ambiance/gtk-3.20/gtk-main.css 2018-04-10 22:58:50 +0000
3+++ Ambiance/gtk-3.20/gtk-main.css 2018-04-10 22:58:50 +0000
4@@ -11,6 +11,7 @@
5 @define-color tooltip_fg_color #ffffff;
6 @define-color backdrop_fg_color mix (@bg_color, @fg_color, 0.8);
7 @define-color backdrop_text_color mix (@base_color, @text_color, 0.8);
8+@define-color dark_borders shade (@dark_bg_color, 0.9);
9
10 @define-color active_shadow_color black;
11 @define-color inactive_shadow_color alpha(black, 0.3);
12
13=== modified file 'Ambiance/gtk-3.20/gtk-widgets-borders.css'
14--- Ambiance/gtk-3.20/gtk-widgets-borders.css 2017-08-27 10:54:41 +0000
15+++ Ambiance/gtk-3.20/gtk-widgets-borders.css 2018-04-10 22:58:50 +0000
16@@ -58,8 +58,11 @@
17 }
18
19 .primary-toolbar entry,
20+.primary-toolbar entry:backdrop,
21 menubar toolbar entry,
22-headerbar entry {
23+menubar toolbar entry:backdrop,
24+headerbar entry,
25+headerbar entry:backdrop {
26 border-image: -gtk-scaled(url("assets/entry-toolbar.png"),url("assets/entry-toolbar@2.png")) 10 12 10 12 / 10px 12px 10px 12px stretch;
27 }
28
29@@ -76,31 +79,25 @@
30 border-width: 0;
31 }
32
33-headerbar box entry:focus {
34+headerbar .linked entry:focus {
35 border: 1px solid @focus_color;
36- margin: 1px 0;
37- padding: 6px;
38 }
39
40-headerbar toolitem box entry:first-child {
41+headerbar toolitem .linked entry:first-child {
42 border-width: 1px 0 1px 1px;
43 margin-left: 1px;
44 }
45
46-headerbar toolitem box entry:first-child:focus {
47- border-width: 1px;
48+headerbar toolitem .linked entry:first-child:focus {
49 margin: 1px 0px 1px 2px;
50+ box-shadow: inset -1px 0 @focus_color;
51 }
52
53-headerbar toolitem box entry:disabled {
54+headerbar toolitem .linked entry:disabled {
55 border-right-width: 1px;
56 margin: 1px 1px 1px 0;
57 }
58
59-headerbar toolitem box entry:disabled:backdrop {
60- margin: 0 1px 0 0;
61-}
62-
63 /******************
64 * comboboxentry *
65 ******************/
66
67=== modified file 'Ambiance/gtk-3.20/gtk-widgets.css'
68--- Ambiance/gtk-3.20/gtk-widgets.css 2018-04-10 22:58:50 +0000
69+++ Ambiance/gtk-3.20/gtk-widgets.css 2018-04-10 22:58:50 +0000
70@@ -424,13 +424,13 @@
71 headerbar .linked button,
72 headerbar .horizontal.linked button {
73 box-shadow: inset 1px 0 @panel_lighter_color,
74- inset -1px 0 shade (@dark_bg_color, 0.9);
75+ inset -1px 0 @dark_borders;
76 }
77
78 .primary-toolbar .linked button:first-child,
79 headerbar .linked button:first-child,
80 headerbar .horizontal.linked button:first-child {
81- box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9);
82+ box-shadow: inset -1px 0 @dark_borders;
83 }
84
85 .primary-toolbar .linked button:last-child,
86@@ -1319,7 +1319,7 @@
87
88 border-image: -gtk-gradient (linear, left top, left bottom,
89 from (shade (@dark_bg_color, 0.75)),
90- to (shade (@dark_bg_color, 0.9))) 1;
91+ to (@dark_borders)) 1;
92 border-image-width: 1px;
93 }
94
95@@ -2882,7 +2882,7 @@
96 .maximized .titlebar:not(headerbar),
97 .maximized headerbar,
98 /* Workaround for LP: #1689239, selects headerbars used as toolbar in Unity */
99-:not(.titlebar) > headerbar:not(.titlebar),
100+:not(.titlebar):not(stack) > headerbar:not(.titlebar),
101 window.csd.unity-csd.maximized .titlebar,
102 .titlebar.toolbar-mode {
103 -GtkWidget-window-dragging: true;
104@@ -2919,14 +2919,14 @@
105 .maximized .titlebar:not(headerbar):backdrop,
106 .maximized headerbar:backdrop,
107 /* Workaround for LP: #1689239, selects headerbars used as toolbar in Unity */
108-:not(.titlebar) > headerbar:not(.titlebar):backdrop,
109+:not(.titlebar):not(stack) > headerbar:not(.titlebar):backdrop,
110 window.csd.unity-csd.maximized .titlebar:backdrop,
111 .titlebar.toolbar-mode:backdrop {
112 background-image: none;
113 background-color: @dark_bg_color;
114 box-shadow: none;
115 border-top-color: @dark_bg_color;
116- border-bottom-color: shade (@dark_bg_color, 0.9);
117+ border-bottom-color: @dark_borders;
118
119 color: @backdrop_dark_fg_color;
120 }
121@@ -3000,7 +3000,7 @@
122 headerbar button:backdrop *,
123 headerbar button:disabled:backdrop *,
124 headerbar button:checked:backdrop * {
125- text-shadow: 0 -1px shade (@dark_bg_color, 0.9);
126+ text-shadow: 0 -1px @dark_borders;
127 }
128
129 .primary-toolbar button.flat:backdrop {
130
131=== modified file 'Ambiance/gtk-3.20/public-colors.css'
132--- Ambiance/gtk-3.20/public-colors.css 2018-04-10 22:58:50 +0000
133+++ Ambiance/gtk-3.20/public-colors.css 2018-04-10 22:58:50 +0000
134@@ -49,7 +49,7 @@
135 @define-color unfocused_insensitive_color @insensitive_fg_color;
136 /*
137 widgets main borders color */
138-@define-color borders shade(@bg_color, 0.84);
139+@define-color borders alpha (shade (@bg_color, 0.45), 0.3);
140 /*
141 widgets main borders color on backdrop windows */
142 @define-color unfocused_borders @borders;
143
144=== modified file 'Radiance/gtk-3.20/gtk-main.css'
145--- Radiance/gtk-3.20/gtk-main.css 2018-04-10 22:58:50 +0000
146+++ Radiance/gtk-3.20/gtk-main.css 2018-04-10 22:58:50 +0000
147@@ -11,6 +11,7 @@
148 @define-color tooltip_fg_color #ffffff;
149 @define-color backdrop_fg_color mix (@bg_color, @fg_color, 0.8);
150 @define-color backdrop_text_color mix (@base_color, @text_color, 0.8);
151+@define-color dark_borders shade (@dark_bg_color, 0.9);
152
153 @define-color active_shadow_color black;
154 @define-color inactive_shadow_color alpha(black, 0.3);
155
156=== modified file 'Radiance/gtk-3.20/gtk-widgets-borders.css'
157--- Radiance/gtk-3.20/gtk-widgets-borders.css 2017-08-27 10:54:41 +0000
158+++ Radiance/gtk-3.20/gtk-widgets-borders.css 2018-04-10 22:58:50 +0000
159@@ -76,33 +76,33 @@
160 border-width: 0;
161 }
162
163-headerbar box entry:focus {
164+headerbar .linked entry:focus {
165 border: 1px solid @focus_color;
166 margin: 1px 0;
167 padding: 6px;
168 }
169
170-headerbar toolitem box entry:first-child {
171+headerbar toolitem .linked entry:first-child {
172 border-image-width: 10px 0px 10px 12px;
173 border-radius: 8px 0 0 8px;
174 border-width: 1px;
175 margin-left: 1px;
176 }
177
178-headerbar toolitem box entry:first-child:focus {
179+headerbar toolitem .linked entry:first-child:focus {
180 border-image-width: 10px 0px 10px 12px;
181 border-radius: 8px 0 0 8px;
182 border-width: 1px;
183 margin: 1px 1px 1px 2px;
184 }
185
186-headerbar toolitem box entry:disabled {
187+headerbar toolitem .linked entry:disabled {
188 border-image-width: 10px 12px 10px 0px;
189 border-right-width: 1px;
190 margin-right: 1px;
191 }
192
193-headerbar toolitem box entry:disabled:backdrop {
194+headerbar toolitem .linked entry:disabled:backdrop {
195 border-image-width: 10px 12px 10px 0px;
196 border-right-width: 1px;
197 }
198
199=== modified file 'Radiance/gtk-3.20/gtk-widgets.css'
200--- Radiance/gtk-3.20/gtk-widgets.css 2018-04-10 22:58:50 +0000
201+++ Radiance/gtk-3.20/gtk-widgets.css 2018-04-10 22:58:50 +0000
202@@ -424,12 +424,12 @@
203 .primary-toolbar .linked button,
204 headerbar .horizontal.linked button {
205 box-shadow: inset 1px 0 @panel_lighter_color,
206- inset -1px 0 shade (@dark_bg_color, 0.9);
207+ inset -1px 0 @dark_borders;
208 }
209
210 .primary-toolbar .linked button:first-child,
211 headerbar .horizontal.linked button:first-child {
212- box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9);
213+ box-shadow: inset -1px 0 @dark_borders;
214 }
215
216 .primary-toolbar .linked button:last-child,
217@@ -441,7 +441,7 @@
218 headerbar .horizontal.linked button:active,
219 .primary-toolbar .linked button:disabled,
220 headerbar .horizontal.linked button:disabled {
221- box-shadow: inset 1px 0 shade (@dark_bg_color, 0.9);
222+ box-shadow: inset 1px 0 @dark_borders;
223 }
224
225 .primary-toolbar .linked button:only-child,
226@@ -1324,7 +1324,7 @@
227
228 border-image: -gtk-gradient (linear, left top, left bottom,
229 from (shade (@dark_bg_color, 0.75)),
230- to (shade (@dark_bg_color, 0.9))) 1;
231+ to (@dark_borders)) 1;
232 border-image-width: 1px;
233 }
234
235@@ -2875,7 +2875,7 @@
236 .maximized .titlebar:not(headerbar),
237 .maximized headerbar,
238 /* Workaround for LP: #1689239, selects headerbars used as toolbar in Unity */
239-:not(.titlebar) > headerbar:not(.titlebar),
240+:not(.titlebar):not(stack) > headerbar:not(.titlebar),
241 window.csd.unity-csd.maximized .titlebar,
242 .titlebar.toolbar-mode {
243 -GtkWidget-window-dragging: true;
244@@ -2911,14 +2911,14 @@
245 .maximized .titlebar:not(headerbar):backdrop,
246 .maximized headerbar:backdrop,
247 /* Workaround for LP: #1689239, selects headerbars used as toolbar in Unity */
248-:not(.titlebar) > headerbar:not(.titlebar):backdrop,
249+:not(.titlebar):not(stack) > headerbar:not(.titlebar):backdrop,
250 window.csd.unity-csd.maximized .titlebar:backdrop,
251 .titlebar.toolbar-mode:backdrop {
252 background-image: none;
253 background-color: @dark_bg_color;
254 box-shadow: none;
255 border-top-color: @dark_bg_color;
256- border-bottom-color: shade (@dark_bg_color, 0.9);
257+ border-bottom-color: @dark_borders;
258
259 color: @backdrop_dark_fg_color;
260 }
261@@ -2992,7 +2992,7 @@
262 headerbar button:backdrop *,
263 headerbar button:disabled:backdrop *,
264 headerbar button:checked:backdrop * {
265- text-shadow: 0 -1px shade (@dark_bg_color, 0.9);
266+ text-shadow: 0 -1px @dark_borders;
267 }
268
269 .primary-toolbar button.flat:backdrop {
270
271=== modified file 'Radiance/gtk-3.20/public-colors.css'
272--- Radiance/gtk-3.20/public-colors.css 2018-04-10 22:58:50 +0000
273+++ Radiance/gtk-3.20/public-colors.css 2018-04-10 22:58:50 +0000
274@@ -49,7 +49,7 @@
275 @define-color unfocused_insensitive_color @insensitive_fg_color;
276 /*
277 widgets main borders color */
278-@define-color borders shade(@bg_color, 0.84);
279+@define-color borders alpha (shade (@bg_color, 0.45), 0.3);
280 /*
281 widgets main borders color on backdrop windows */
282 @define-color unfocused_borders @borders;

Subscribers

People subscribed via source and target branches