Merge lp:~3v1n0/ubuntu-themes/placessidebar-ambiance-rw-inspired into lp:ubuntu-themes
- placessidebar-ambiance-rw-inspired
- Merge into trunk
Proposed by
Marco Trevisan (Treviño)
Status: | Merged |
---|---|
Approved by: | Andrea Azzarone |
Approved revision: | 621 |
Merged at revision: | 606 |
Proposed branch: | lp:~3v1n0/ubuntu-themes/placessidebar-ambiance-rw-inspired |
Merge into: | lp:ubuntu-themes |
Prerequisite: | lp:~3v1n0/ubuntu-themes/backdrop-views |
Diff against target: |
695 lines (+422/-134) 4 files modified
Ambiance/gtk-3.20/gtk-main.css (+4/-0) Ambiance/gtk-3.20/gtk-widgets.css (+207/-67) Radiance/gtk-3.20/gtk-main.css (+4/-0) Radiance/gtk-3.20/gtk-widgets.css (+207/-67) |
To merge this branch: | bzr merge lp:~3v1n0/ubuntu-themes/placessidebar-ambiance-rw-inspired |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrea Azzarone (community) | Approve | ||
Review via email: mp+341878@code.launchpad.net |
This proposal supersedes a proposal from 2018-03-22.
Commit message
Ambiance, Radiance: implement ambiance-rw inspired darker placessidebar
Imported https:/
to be easier to maintain, limiting gradients usage and adding
implementation for RTL directions and backdrop.
Also, support it for Radiance too.
Description of the change
Before: https:/
After: https:/
Based on https:/
As per design decision: https:/
DIff might be a bit confusing as not all the prerequisites have been merged. Check commits, please.
To post a comment you must log in.
- 621. By Marco Trevisan (Treviño)
-
Ambiance, Radiance: remove unsupported size property
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-01-17 17:09:29 +0000 | |||
3 | +++ Ambiance/gtk-3.20/gtk-main.css 2018-03-22 08:03:56 +0000 | |||
4 | @@ -127,6 +127,10 @@ | |||
5 | 127 | @define-color panel_lighter_color shade (@dark_bg_color, 1.4); | 127 | @define-color panel_lighter_color shade (@dark_bg_color, 1.4); |
6 | 128 | @define-color panel_darker_color shade (@dark_bg_color, 0.96); | 128 | @define-color panel_darker_color shade (@dark_bg_color, 0.96); |
7 | 129 | @define-color maximized_header_color shade (@dark_bg_color, 1.3); | 129 | @define-color maximized_header_color shade (@dark_bg_color, 1.3); |
8 | 130 | @define-color places_sidebar_bg shade(@dark_bg_color, 1.56); | ||
9 | 131 | @define-color places_sidebar_backdrop_bg mix(@places_sidebar_bg, @bg_color, 0.15); | ||
10 | 132 | @define-color places_sidebar_fg_color @selected_fg_color; | ||
11 | 133 | @define-color places_sidebar_selected_bg_color @selected_bg_color; | ||
12 | 130 | 134 | ||
13 | 131 | @define-color suggested_action_bg #38b44a; | 135 | @define-color suggested_action_bg #38b44a; |
14 | 132 | 136 | ||
15 | 133 | 137 | ||
16 | === modified file 'Ambiance/gtk-3.20/gtk-widgets.css' | |||
17 | --- Ambiance/gtk-3.20/gtk-widgets.css 2018-03-22 08:03:56 +0000 | |||
18 | +++ Ambiance/gtk-3.20/gtk-widgets.css 2018-03-22 08:03:56 +0000 | |||
19 | @@ -1114,20 +1114,15 @@ | |||
20 | 1114 | 1114 | ||
21 | 1115 | toolbar menu, | 1115 | toolbar menu, |
22 | 1116 | combobox menu { | 1116 | combobox menu { |
30 | 1117 | background-image: none; | 1117 | background-image: linear-gradient(to bottom left, |
31 | 1118 | background-color: @bg_color; | 1118 | shade (@bg_color, 1.2), |
32 | 1119 | border-bottom-color: shade (@bg_color, 0.66); | 1119 | shade (@bg_color, 0.97), |
33 | 1120 | border-right-color: shade (@bg_color, 0.7); | 1120 | shade (@bg_color, 1.2)); |
34 | 1121 | border-left-color: shade (@bg_color, 0.7); | 1121 | background-color: transparent; |
35 | 1122 | border-top-color: shade (@bg_color, 0.8); | 1122 | border: none; |
29 | 1123 | border-style: solid; | ||
36 | 1124 | padding: 0; | 1123 | padding: 0; |
37 | 1125 | 1124 | ||
43 | 1126 | color: @fg_color; | 1125 | box-shadow: 13px 13px 13px 6px @inactive_shadow_color; |
39 | 1127 | |||
40 | 1128 | box-shadow: inset -1px 0 shade (@bg_color, 1.18), | ||
41 | 1129 | inset 1px 0 shade (@bg_color, 1.18), | ||
42 | 1130 | inset 0 1px shade (@bg_color, 1.18); | ||
44 | 1131 | } | 1126 | } |
45 | 1132 | 1127 | ||
46 | 1133 | menu:selected { | 1128 | menu:selected { |
47 | @@ -1207,15 +1202,15 @@ | |||
48 | 1207 | } | 1202 | } |
49 | 1208 | 1203 | ||
50 | 1209 | /* Workaround for lp:949368 */ | 1204 | /* Workaround for lp:949368 */ |
52 | 1210 | combobox menuitem * { | 1205 | combobox menuitem { |
53 | 1211 | color: @fg_color; | 1206 | color: @fg_color; |
54 | 1212 | } | 1207 | } |
55 | 1213 | 1208 | ||
57 | 1214 | combobox menuitem *:hover { | 1209 | combobox menuitem:hover { |
58 | 1215 | color: @selected_fg_color; | 1210 | color: @selected_fg_color; |
59 | 1211 | text-shadow: 0 -1px shade (@dark_bg_color, 0.7); | ||
60 | 1216 | } | 1212 | } |
61 | 1217 | 1213 | ||
62 | 1218 | |||
63 | 1219 | popover modelbutton:hover, | 1214 | popover modelbutton:hover, |
64 | 1220 | popover menuitem:checked:hover, | 1215 | popover menuitem:checked:hover, |
65 | 1221 | menuitem:hover, | 1216 | menuitem:hover, |
66 | @@ -2090,56 +2085,186 @@ | |||
67 | 2090 | ***********/ | 2085 | ***********/ |
68 | 2091 | 2086 | ||
69 | 2092 | filechooser box.search-bar, | 2087 | filechooser box.search-bar, |
72 | 2093 | #pathbarbox, | 2088 | #pathbarbox { |
73 | 2094 | placessidebar.sidebar, | 2089 | background-color: shade (@bg_color, 0.95); |
74 | 2090 | color: @fg_color; | ||
75 | 2091 | text-shadow: none; | ||
76 | 2092 | } | ||
77 | 2093 | |||
78 | 2095 | placessidebar.sidebar list { | 2094 | placessidebar.sidebar list { |
97 | 2096 | background-color: shade (@bg_color, 0.95); | 2095 | background-color: transparent; |
98 | 2097 | 2096 | } | |
99 | 2098 | color: @fg_color; | 2097 | |
100 | 2099 | text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.04); | 2098 | placessidebar.sidebar list separator { |
101 | 2100 | } | 2099 | background: transparent; |
102 | 2101 | 2100 | } | |
103 | 2102 | filechooser:backdrop box.search-bar, | 2101 | |
104 | 2103 | #pathbarbox:backdrop, | 2102 | paned placessidebar.sidebar:dir(ltr), |
105 | 2104 | .sidebar list:backdrop, | 2103 | paned placessidebar.sidebar:dir(rtl), |
106 | 2105 | placessidebar.sidebar:backdrop, | 2104 | placessidebar.sidebar:dir(ltr), |
107 | 2106 | placessidebar.sidebar list:backdrop { | 2105 | placessidebar.sidebar:dir(rtl) { |
108 | 2107 | color: mix (@fg_color, shade (@bg_color, 0.95), 0.2); | 2106 | border: none; |
109 | 2108 | text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.02); | 2107 | min-width: 150px; |
110 | 2109 | } | 2108 | background-color: @places_sidebar_bg; |
111 | 2110 | 2109 | color: @places_sidebar_fg_color; | |
112 | 2111 | placessidebar.sidebar row, | 2110 | text-shadow: 0 -1px alpha (shade (@fg_color, 1.55), 0.5); |
113 | 2112 | placessidebar.sidebar list row, | 2111 | } |
114 | 2113 | .sidebar list { | 2112 | |
115 | 2113 | paned placessidebar.sidebar:dir(ltr), | ||
116 | 2114 | placessidebar.sidebar:dir(ltr) { | ||
117 | 2115 | box-shadow: inset 39px -1px 0px 0px shade(@places_sidebar_bg, 0.75), | ||
118 | 2116 | inset 38px -1px 0px 0px shade(@places_sidebar_bg, 0.85); | ||
119 | 2117 | } | ||
120 | 2118 | |||
121 | 2119 | paned placessidebar.sidebar:dir(rtl), | ||
122 | 2120 | placessidebar.sidebar:dir(rtl) { | ||
123 | 2121 | box-shadow: inset -39px -1px 0px 0px shade(@places_sidebar_bg, 0.75), | ||
124 | 2122 | inset -38px -1px 0px 0px shade(@places_sidebar_bg, 0.85); | ||
125 | 2123 | } | ||
126 | 2124 | |||
127 | 2125 | paned placessidebar.sidebar:dir(ltr):backdrop, | ||
128 | 2126 | paned placessidebar.sidebar:dir(rtl):backdrop, | ||
129 | 2127 | placessidebar.sidebar:dir(ltr):backdrop, | ||
130 | 2128 | placessidebar.sidebar:dir(rtl):backdrop { | ||
131 | 2129 | background-color: @places_sidebar_backdrop_bg; | ||
132 | 2130 | } | ||
133 | 2131 | |||
134 | 2132 | paned placessidebar.sidebar:dir(ltr):backdrop, | ||
135 | 2133 | placessidebar.sidebar:dir(ltr):backdrop { | ||
136 | 2134 | box-shadow: inset 39px -1px 0px 0px mix(shade(@places_sidebar_bg, 0.75), @bg_color, 0.15), | ||
137 | 2135 | inset 38px -1px 0px 0px mix(shade(@places_sidebar_bg, 0.85), @bg_color, 0.15); | ||
138 | 2136 | } | ||
139 | 2137 | |||
140 | 2138 | paned placessidebar.sidebar:dir(rtl):backdrop, | ||
141 | 2139 | placessidebar.sidebar:dir(rtl):backdrop { | ||
142 | 2140 | box-shadow: inset -39px -1px 0px 0px mix(shade(@places_sidebar_bg, 0.75), @bg_color, 0.15), | ||
143 | 2141 | inset -38px -1px 0px 0px mix(shade(@places_sidebar_bg, 0.85), @bg_color, 0.15); | ||
144 | 2142 | } | ||
145 | 2143 | |||
146 | 2144 | placessidebar.sidebar row.sidebar-row { | ||
147 | 2145 | color: shade(@places_sidebar_fg_color, 0.9); | ||
148 | 2146 | background-image: none; | ||
149 | 2147 | background-repeat: no-repeat; | ||
150 | 2148 | background-position: top left; | ||
151 | 2149 | background-color: transparent; | ||
152 | 2114 | min-height: 30px; | 2150 | min-height: 30px; |
181 | 2115 | } | 2151 | border:none; |
182 | 2116 | 2152 | text-shadow: none; | |
183 | 2117 | placessidebar.sidebar list row.activatable:hover:not(:selected), | 2153 | } |
184 | 2118 | placessidebar.sidebar list row.has-open-popup { | 2154 | |
185 | 2119 | background-color: shade (shade (@bg_color, 0.95), 0.965); | 2155 | placessidebar.sidebar row.sidebar-row:hover { |
186 | 2120 | } | 2156 | background-color: transparent; |
187 | 2121 | 2157 | background-image: linear-gradient(to right, | |
188 | 2122 | placessidebar.sidebar row:selected, | 2158 | transparent 39px, |
189 | 2123 | placessidebar.sidebar list row:selected { | 2159 | @places_sidebar_selected_bg_color 39px, |
190 | 2124 | color: @selected_fg_color; | 2160 | @places_sidebar_selected_bg_color 100%); |
191 | 2125 | text-shadow: 0 1px shade (@selected_bg_color, 0.7); | 2161 | color: @places_sidebar_fg_color; |
192 | 2126 | } | 2162 | text-shadow: 0 -1px alpha (shade (@fg_color, 1.55), 0.5); |
193 | 2127 | 2163 | } | |
194 | 2128 | placessidebar.sidebar row:selected:backdrop, | 2164 | |
195 | 2129 | placessidebar.sidebar list row:selected:backdrop { | 2165 | placessidebar.sidebar row.sidebar-row:hover:dir(rtl) { |
196 | 2130 | background-image: -gtk-gradient (linear, left top, left bottom, | 2166 | background-image: linear-gradient(to left, |
197 | 2131 | from (shade (shade (@bg_color, 0.95), 0.94)), | 2167 | transparent 39px, |
198 | 2132 | to (shade (shade (@bg_color, 0.95), 0.86))); | 2168 | @places_sidebar_selected_bg_color 39px, |
199 | 2133 | border-top-color: shade (shade (@bg_color, 0.95), 0.88); | 2169 | @places_sidebar_selected_bg_color 100%); |
200 | 2134 | 2170 | } | |
201 | 2135 | color: @fg_color; | 2171 | |
202 | 2136 | text-shadow: 0 1px shade (shade (@bg_color, 0.95), 0.96); | 2172 | placessidebar.sidebar row.sidebar-row:hover:backdrop { |
203 | 2137 | } | 2173 | background-image: linear-gradient(to right, |
204 | 2138 | 2174 | transparent 39px, | |
205 | 2139 | placessidebar.sidebar .sidebar-icon, | 2175 | alpha(@backdrop_selected_bg_color, 0.4) 39px, |
206 | 2140 | placessidebar.sidebar list .sidebar-icon { | 2176 | alpha(@backdrop_selected_bg_color, 0.4) 100%); |
207 | 2141 | padding-left: 10px; | 2177 | color: @backdrop_selected_fg_color; |
208 | 2142 | padding-right: 10px; | 2178 | } |
209 | 2179 | |||
210 | 2180 | placessidebar.sidebar row.sidebar-row:hover:dir(rtl):backdrop { | ||
211 | 2181 | background-image: linear-gradient(to left, | ||
212 | 2182 | transparent 39px, | ||
213 | 2183 | alpha(@backdrop_selected_bg_color, 0.4) 39px, | ||
214 | 2184 | alpha(@backdrop_selected_bg_color, 0.4) 100%); | ||
215 | 2185 | } | ||
216 | 2186 | |||
217 | 2187 | placessidebar.sidebar row.sidebar-row:selected:hover, | ||
218 | 2188 | placessidebar.sidebar row.sidebar-row:active:hover { | ||
219 | 2189 | background-color: transparent; | ||
220 | 2190 | background-image: linear-gradient(to right, | ||
221 | 2191 | @places_sidebar_bg 39px, | ||
222 | 2192 | @places_sidebar_selected_bg_color 39px, | ||
223 | 2193 | @places_sidebar_selected_bg_color 100%); | ||
224 | 2194 | text-shadow: 0 -1px alpha (shade (@fg_color, 1.55), 0.5); | ||
225 | 2195 | color: @places_sidebar_fg_color; | ||
226 | 2196 | } | ||
227 | 2197 | |||
228 | 2198 | placessidebar.sidebar row.sidebar-row:selected:hover:dir(rtl), | ||
229 | 2199 | placessidebar.sidebar row.sidebar-row:active:hover:dir(rtl) { | ||
230 | 2200 | background-image: linear-gradient(to left, | ||
231 | 2201 | @places_sidebar_bg 39px, | ||
232 | 2202 | @places_sidebar_selected_bg_color 39px, | ||
233 | 2203 | @places_sidebar_selected_bg_color 100%); | ||
234 | 2204 | } | ||
235 | 2205 | |||
236 | 2206 | placessidebar.sidebar row.sidebar-row:selected:hover:backdrop, | ||
237 | 2207 | placessidebar.sidebar row.sidebar-row:active:hover:backdrop { | ||
238 | 2208 | background-image: linear-gradient(to right, | ||
239 | 2209 | @places_sidebar_backdrop_bg 39px, | ||
240 | 2210 | alpha(@backdrop_selected_bg_color, 0.4) 39px, | ||
241 | 2211 | alpha(@backdrop_selected_bg_color, 0.4) 100%); | ||
242 | 2212 | color: @backdrop_selected_fg_color; | ||
243 | 2213 | } | ||
244 | 2214 | |||
245 | 2215 | placessidebar.sidebar row.sidebar-row:selected:hover:backdrop:dir(rtl), | ||
246 | 2216 | placessidebar.sidebar row.sidebar-row:active:hover:backdrop:dir(rtl) { | ||
247 | 2217 | background-image: linear-gradient(to left, | ||
248 | 2218 | @places_sidebar_backdrop_bg 39px, | ||
249 | 2219 | alpha(@backdrop_selected_bg_color, 0.4) 39px, | ||
250 | 2220 | alpha(@backdrop_selected_bg_color, 0.4) 100%); | ||
251 | 2221 | } | ||
252 | 2222 | |||
253 | 2223 | placessidebar.sidebar row.sidebar-row:selected, | ||
254 | 2224 | placessidebar.sidebar row.sidebar-row:active { | ||
255 | 2225 | background-color: @places_sidebar_bg; | ||
256 | 2226 | color: shade(@places_sidebar_selected_bg_color, 1.03); | ||
257 | 2227 | text-shadow: 0 1px alpha (shade (@places_sidebar_selected_bg_color, 0.3), 0.5); | ||
258 | 2228 | } | ||
259 | 2229 | |||
260 | 2230 | placessidebar.sidebar row.sidebar-row:selected:backdrop, | ||
261 | 2231 | placessidebar.sidebar row.sidebar-row:active:backdrop { | ||
262 | 2232 | background-color: @places_sidebar_backdrop_bg; | ||
263 | 2233 | color: mix(shade(@places_sidebar_selected_bg_color, 1.03), shade(@places_sidebar_fg_color, 0.9), 0.3); | ||
264 | 2234 | text-shadow: 0 1px alpha (shade (@places_sidebar_selected_bg_color, 0.4), 0.4); | ||
265 | 2235 | } | ||
266 | 2236 | |||
267 | 2237 | placessidebar.sidebar row.sidebar-row .sidebar-icon { | ||
268 | 2238 | text-shadow: none; | ||
269 | 2239 | background-image: none; | ||
270 | 2240 | padding-left: 12px; | ||
271 | 2241 | padding-right: 12px; | ||
272 | 2242 | } | ||
273 | 2243 | |||
274 | 2244 | placessidebar.sidebar row.sidebar-row .sidebar-icon:dir(ltr) { | ||
275 | 2245 | margin-left: 0; | ||
276 | 2246 | margin-right: 12px; | ||
277 | 2247 | } | ||
278 | 2248 | |||
279 | 2249 | placessidebar.sidebar row.sidebar-row .sidebar-icon:dir(rtl) { | ||
280 | 2250 | margin-left: 12px; | ||
281 | 2251 | margin-right: 0; | ||
282 | 2252 | } | ||
283 | 2253 | |||
284 | 2254 | placessidebar.sidebar row.sidebar-row:hover .sidebar-icon:backdrop { | ||
285 | 2255 | color: @places_sidebar_fg_color; | ||
286 | 2256 | } | ||
287 | 2257 | |||
288 | 2258 | placessidebar.sidebar row.sidebar-row:selected.has-open-popup .sidebar-icon, | ||
289 | 2259 | placessidebar.sidebar row.sidebar-row:selected .sidebar-icon, | ||
290 | 2260 | placessidebar.sidebar row.sidebar-row:active:hover .sidebar-icon { | ||
291 | 2261 | color: @places_sidebar_selected_bg_color; | ||
292 | 2262 | background-color: transparent; | ||
293 | 2263 | } | ||
294 | 2264 | |||
295 | 2265 | placessidebar.sidebar row.sidebar-row:selected.has-open-popup .sidebar-icon:backdrop, | ||
296 | 2266 | placessidebar.sidebar row.sidebar-row:selected .sidebar-icon:backdrop { | ||
297 | 2267 | color: mix(shade(@places_sidebar_selected_bg_color, 1.03), shade(@places_sidebar_fg_color, 0.9), 0.3); | ||
298 | 2143 | } | 2268 | } |
299 | 2144 | 2269 | ||
300 | 2145 | .sidebar, | 2270 | .sidebar, |
301 | @@ -3259,10 +3384,20 @@ | |||
302 | 3259 | * popover * | 3384 | * popover * |
303 | 3260 | ************/ | 3385 | ************/ |
304 | 3261 | popover { | 3386 | popover { |
306 | 3262 | background-clip: border-box; | 3387 | background-image: linear-gradient(to bottom left, |
307 | 3388 | shade (@bg_color, 0.98), | ||
308 | 3389 | shade (@bg_color, 0.93), | ||
309 | 3390 | shade (@bg_color, 0.98)); | ||
310 | 3391 | border-radius: 5px; | ||
311 | 3392 | border: none; | ||
312 | 3393 | padding: 2px; | ||
313 | 3394 | } | ||
314 | 3263 | 3395 | ||
315 | 3396 | popover:backdrop { | ||
316 | 3397 | background-image: none; | ||
317 | 3398 | background-color: shade (@bg_color, 0.95); | ||
318 | 3264 | border-radius: 5px; | 3399 | border-radius: 5px; |
320 | 3265 | border: 1px solid darker(@bg_color); | 3400 | border: none; |
321 | 3266 | padding: 2px; | 3401 | padding: 2px; |
322 | 3267 | } | 3402 | } |
323 | 3268 | 3403 | ||
324 | @@ -3291,8 +3426,14 @@ | |||
325 | 3291 | popover menuitem:backdrop:hover { | 3426 | popover menuitem:backdrop:hover { |
326 | 3292 | border: none; | 3427 | border: none; |
327 | 3293 | border-image: none; | 3428 | border-image: none; |
329 | 3294 | background: transparent; | 3429 | border-radius: 3px; |
330 | 3430 | box-shadow: none; | ||
331 | 3431 | background-color: transparent; | ||
332 | 3432 | background-image: -gtk-gradient (linear, left bottom, left top, | ||
333 | 3433 | from (shade (@backdrop_selected_bg_color, 0.95)), | ||
334 | 3434 | to (shade (@backdrop_selected_bg_color, 0.90))); | ||
335 | 3295 | color: @fg_color; | 3435 | color: @fg_color; |
336 | 3436 | text-shadow: 0 -1px alpha (shade (@fg_color, 1.45), 0.7); | ||
337 | 3296 | } | 3437 | } |
338 | 3297 | 3438 | ||
339 | 3298 | popover modelbutton:checked, | 3439 | popover modelbutton:checked, |
340 | @@ -3317,7 +3458,6 @@ | |||
341 | 3317 | background: none; | 3458 | background: none; |
342 | 3318 | } | 3459 | } |
343 | 3319 | 3460 | ||
344 | 3320 | |||
345 | 3321 | /* menu buttons inside popovers */ | 3461 | /* menu buttons inside popovers */ |
346 | 3322 | modelbutton.flat, | 3462 | modelbutton.flat, |
347 | 3323 | popover.background checkbutton, | 3463 | popover.background checkbutton, |
348 | 3324 | 3464 | ||
349 | === modified file 'Radiance/gtk-3.20/gtk-main.css' | |||
350 | --- Radiance/gtk-3.20/gtk-main.css 2018-01-17 17:09:29 +0000 | |||
351 | +++ Radiance/gtk-3.20/gtk-main.css 2018-03-22 08:03:56 +0000 | |||
352 | @@ -126,6 +126,10 @@ | |||
353 | 126 | @define-color panel_lighter_color shade (@dark_bg_color, 1.4); | 126 | @define-color panel_lighter_color shade (@dark_bg_color, 1.4); |
354 | 127 | @define-color panel_darker_color shade (@dark_bg_color, 0.96); | 127 | @define-color panel_darker_color shade (@dark_bg_color, 0.96); |
355 | 128 | @define-color maximized_header_color shade (@dark_bg_color, 1.1); | 128 | @define-color maximized_header_color shade (@dark_bg_color, 1.1); |
356 | 129 | @define-color places_sidebar_bg shade (@dark_bg_color, 1.1); | ||
357 | 130 | @define-color places_sidebar_backdrop_bg mix(@places_sidebar_bg, @bg_color, 0.15); | ||
358 | 131 | @define-color places_sidebar_fg_color @fg_color; | ||
359 | 132 | @define-color places_sidebar_selected_bg_color @selected_bg_color; | ||
360 | 129 | 133 | ||
361 | 130 | @define-color suggested_action_bg #38b44a; | 134 | @define-color suggested_action_bg #38b44a; |
362 | 131 | 135 | ||
363 | 132 | 136 | ||
364 | === modified file 'Radiance/gtk-3.20/gtk-widgets.css' | |||
365 | --- Radiance/gtk-3.20/gtk-widgets.css 2018-03-22 08:03:56 +0000 | |||
366 | +++ Radiance/gtk-3.20/gtk-widgets.css 2018-03-22 08:03:56 +0000 | |||
367 | @@ -1119,20 +1119,15 @@ | |||
368 | 1119 | 1119 | ||
369 | 1120 | toolbar menu, | 1120 | toolbar menu, |
370 | 1121 | combobox menu { | 1121 | combobox menu { |
378 | 1122 | background-image: none; | 1122 | background-image: linear-gradient(to bottom left, |
379 | 1123 | background-color: @bg_color; | 1123 | shade (@bg_color, 1.2), |
380 | 1124 | border-bottom-color: shade (@bg_color, 0.66); | 1124 | shade (@bg_color, 0.97), |
381 | 1125 | border-right-color: shade (@bg_color, 0.7); | 1125 | shade (@bg_color, 1.2)); |
382 | 1126 | border-left-color: shade (@bg_color, 0.7); | 1126 | background-color: transparent; |
383 | 1127 | border-top-color: shade (@bg_color, 0.8); | 1127 | border: none; |
377 | 1128 | border-style: solid; | ||
384 | 1129 | padding: 0; | 1128 | padding: 0; |
385 | 1130 | 1129 | ||
391 | 1131 | color: @fg_color; | 1130 | box-shadow: 13px 13px 13px 6px @inactive_shadow_color; |
387 | 1132 | |||
388 | 1133 | box-shadow: inset -1px 0 shade (@bg_color, 1.18), | ||
389 | 1134 | inset 1px 0 shade (@bg_color, 1.18), | ||
390 | 1135 | inset 0 1px shade (@bg_color, 1.18); | ||
392 | 1136 | } | 1131 | } |
393 | 1137 | 1132 | ||
394 | 1138 | menu:selected { | 1133 | menu:selected { |
395 | @@ -1212,15 +1207,15 @@ | |||
396 | 1212 | } | 1207 | } |
397 | 1213 | 1208 | ||
398 | 1214 | /* Workaround for lp:949368 */ | 1209 | /* Workaround for lp:949368 */ |
400 | 1215 | combobox menuitem * { | 1210 | combobox menuitem { |
401 | 1216 | color: @fg_color; | 1211 | color: @fg_color; |
402 | 1217 | } | 1212 | } |
403 | 1218 | 1213 | ||
405 | 1219 | combobox menuitem *:hover { | 1214 | combobox menuitem:hover { |
406 | 1220 | color: @selected_fg_color; | 1215 | color: @selected_fg_color; |
407 | 1216 | text-shadow: 0 -1px shade (@dark_bg_color, 0.7); | ||
408 | 1221 | } | 1217 | } |
409 | 1222 | 1218 | ||
410 | 1223 | |||
411 | 1224 | popover modelbutton:hover, | 1219 | popover modelbutton:hover, |
412 | 1225 | popover menuitem:checked:hover, | 1220 | popover menuitem:checked:hover, |
413 | 1226 | menuitem:hover, | 1221 | menuitem:hover, |
414 | @@ -2085,56 +2080,186 @@ | |||
415 | 2085 | ***********/ | 2080 | ***********/ |
416 | 2086 | 2081 | ||
417 | 2087 | filechooser box.search-bar, | 2082 | filechooser box.search-bar, |
420 | 2088 | #pathbarbox, | 2083 | #pathbarbox { |
421 | 2089 | placessidebar.sidebar, | 2084 | background-color: shade (@bg_color, 0.95); |
422 | 2085 | color: @fg_color; | ||
423 | 2086 | text-shadow: none; | ||
424 | 2087 | } | ||
425 | 2088 | |||
426 | 2090 | placessidebar.sidebar list { | 2089 | placessidebar.sidebar list { |
445 | 2091 | background-color: shade (@bg_color, 0.95); | 2090 | background-color: transparent; |
446 | 2092 | 2091 | } | |
447 | 2093 | color: @fg_color; | 2092 | |
448 | 2094 | text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.04); | 2093 | placessidebar.sidebar list separator { |
449 | 2095 | } | 2094 | background: transparent; |
450 | 2096 | 2095 | } | |
451 | 2097 | filechooser:backdrop box.search-bar, | 2096 | |
452 | 2098 | #pathbarbox:backdrop, | 2097 | paned placessidebar.sidebar:dir(ltr), |
453 | 2099 | .sidebar list:backdrop, | 2098 | paned placessidebar.sidebar:dir(rtl), |
454 | 2100 | placessidebar.sidebar:backdrop, | 2099 | placessidebar.sidebar:dir(ltr), |
455 | 2101 | placessidebar.sidebar list:backdrop { | 2100 | placessidebar.sidebar:dir(rtl) { |
456 | 2102 | color: mix (@fg_color, shade (@bg_color, 0.95), 0.2); | 2101 | border: none; |
457 | 2103 | text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.02); | 2102 | min-width: 150px; |
458 | 2104 | } | 2103 | background-color: @places_sidebar_bg; |
459 | 2105 | 2104 | color: @places_sidebar_fg_color; | |
460 | 2106 | placessidebar.sidebar row, | 2105 | text-shadow: 0 -1px alpha (shade (@fg_color, 1.55), 0.5); |
461 | 2107 | placessidebar.sidebar list row, | 2106 | } |
462 | 2108 | .sidebar list { | 2107 | |
463 | 2108 | paned placessidebar.sidebar:dir(ltr), | ||
464 | 2109 | placessidebar.sidebar:dir(ltr) { | ||
465 | 2110 | box-shadow: inset 39px -1px 0px 0px shade(@places_sidebar_bg, 0.75), | ||
466 | 2111 | inset 38px -1px 0px 0px shade(@places_sidebar_bg, 0.85); | ||
467 | 2112 | } | ||
468 | 2113 | |||
469 | 2114 | paned placessidebar.sidebar:dir(rtl), | ||
470 | 2115 | placessidebar.sidebar:dir(rtl) { | ||
471 | 2116 | box-shadow: inset -39px -1px 0px 0px shade(@places_sidebar_bg, 0.75), | ||
472 | 2117 | inset -38px -1px 0px 0px shade(@places_sidebar_bg, 0.85); | ||
473 | 2118 | } | ||
474 | 2119 | |||
475 | 2120 | paned placessidebar.sidebar:dir(ltr):backdrop, | ||
476 | 2121 | paned placessidebar.sidebar:dir(rtl):backdrop, | ||
477 | 2122 | placessidebar.sidebar:dir(ltr):backdrop, | ||
478 | 2123 | placessidebar.sidebar:dir(rtl):backdrop { | ||
479 | 2124 | background-color: @places_sidebar_backdrop_bg; | ||
480 | 2125 | } | ||
481 | 2126 | |||
482 | 2127 | paned placessidebar.sidebar:dir(ltr):backdrop, | ||
483 | 2128 | placessidebar.sidebar:dir(ltr):backdrop { | ||
484 | 2129 | box-shadow: inset 39px -1px 0px 0px mix(shade(@places_sidebar_bg, 0.75), @bg_color, 0.15), | ||
485 | 2130 | inset 38px -1px 0px 0px mix(shade(@places_sidebar_bg, 0.85), @bg_color, 0.15); | ||
486 | 2131 | } | ||
487 | 2132 | |||
488 | 2133 | paned placessidebar.sidebar:dir(rtl):backdrop, | ||
489 | 2134 | placessidebar.sidebar:dir(rtl):backdrop { | ||
490 | 2135 | box-shadow: inset -39px -1px 0px 0px mix(shade(@places_sidebar_bg, 0.75), @bg_color, 0.15), | ||
491 | 2136 | inset -38px -1px 0px 0px mix(shade(@places_sidebar_bg, 0.85), @bg_color, 0.15); | ||
492 | 2137 | } | ||
493 | 2138 | |||
494 | 2139 | placessidebar.sidebar row.sidebar-row { | ||
495 | 2140 | color: shade(@places_sidebar_fg_color, 0.9); | ||
496 | 2141 | background-image: none; | ||
497 | 2142 | background-repeat: no-repeat; | ||
498 | 2143 | background-position: top left; | ||
499 | 2144 | background-color: transparent; | ||
500 | 2109 | min-height: 30px; | 2145 | min-height: 30px; |
529 | 2110 | } | 2146 | border:none; |
530 | 2111 | 2147 | text-shadow: none; | |
531 | 2112 | placessidebar.sidebar list row.activatable:hover:not(:selected), | 2148 | } |
532 | 2113 | placessidebar.sidebar list row.has-open-popup { | 2149 | |
533 | 2114 | background-color: shade (shade (@bg_color, 0.95), 0.965); | 2150 | placessidebar.sidebar row.sidebar-row:hover { |
534 | 2115 | } | 2151 | background-color: transparent; |
535 | 2116 | 2152 | background-image: linear-gradient(to right, | |
536 | 2117 | placessidebar.sidebar row:selected, | 2153 | transparent 39px, |
537 | 2118 | placessidebar.sidebar list row:selected { | 2154 | @places_sidebar_selected_bg_color 39px, |
538 | 2119 | color: @selected_fg_color; | 2155 | @places_sidebar_selected_bg_color 100%); |
539 | 2120 | text-shadow: 0 1px shade (@selected_bg_color, 0.7); | 2156 | color: @places_sidebar_fg_color; |
540 | 2121 | } | 2157 | text-shadow: 0 -1px alpha (shade (@fg_color, 1.55), 0.5); |
541 | 2122 | 2158 | } | |
542 | 2123 | placessidebar.sidebar row:selected:backdrop, | 2159 | |
543 | 2124 | placessidebar.sidebar list row:selected:backdrop { | 2160 | placessidebar.sidebar row.sidebar-row:hover:dir(rtl) { |
544 | 2125 | background-image: -gtk-gradient (linear, left top, left bottom, | 2161 | background-image: linear-gradient(to left, |
545 | 2126 | from (shade (shade (@bg_color, 0.95), 0.94)), | 2162 | transparent 39px, |
546 | 2127 | to (shade (shade (@bg_color, 0.95), 0.86))); | 2163 | @places_sidebar_selected_bg_color 39px, |
547 | 2128 | border-top-color: shade (shade (@bg_color, 0.95), 0.88); | 2164 | @places_sidebar_selected_bg_color 100%); |
548 | 2129 | 2165 | } | |
549 | 2130 | color: @fg_color; | 2166 | |
550 | 2131 | text-shadow: 0 1px shade (shade (@bg_color, 0.95), 0.96); | 2167 | placessidebar.sidebar row.sidebar-row:hover:backdrop { |
551 | 2132 | } | 2168 | background-image: linear-gradient(to right, |
552 | 2133 | 2169 | transparent 39px, | |
553 | 2134 | placessidebar.sidebar .sidebar-icon, | 2170 | alpha(@backdrop_selected_bg_color, 0.4) 39px, |
554 | 2135 | placessidebar.sidebar list .sidebar-icon { | 2171 | alpha(@backdrop_selected_bg_color, 0.4) 100%); |
555 | 2136 | padding-left: 10px; | 2172 | color: @backdrop_selected_fg_color; |
556 | 2137 | padding-right: 10px; | 2173 | } |
557 | 2174 | |||
558 | 2175 | placessidebar.sidebar row.sidebar-row:hover:dir(rtl):backdrop { | ||
559 | 2176 | background-image: linear-gradient(to left, | ||
560 | 2177 | transparent 39px, | ||
561 | 2178 | alpha(@backdrop_selected_bg_color, 0.4) 39px, | ||
562 | 2179 | alpha(@backdrop_selected_bg_color, 0.4) 100%); | ||
563 | 2180 | } | ||
564 | 2181 | |||
565 | 2182 | placessidebar.sidebar row.sidebar-row:selected:hover, | ||
566 | 2183 | placessidebar.sidebar row.sidebar-row:active:hover { | ||
567 | 2184 | background-color: transparent; | ||
568 | 2185 | background-image: linear-gradient(to right, | ||
569 | 2186 | @places_sidebar_bg 39px, | ||
570 | 2187 | @places_sidebar_selected_bg_color 39px, | ||
571 | 2188 | @places_sidebar_selected_bg_color 100%); | ||
572 | 2189 | text-shadow: 0 -1px alpha (shade (@fg_color, 1.55), 0.5); | ||
573 | 2190 | color: @places_sidebar_fg_color; | ||
574 | 2191 | } | ||
575 | 2192 | |||
576 | 2193 | placessidebar.sidebar row.sidebar-row:selected:hover:dir(rtl), | ||
577 | 2194 | placessidebar.sidebar row.sidebar-row:active:hover:dir(rtl) { | ||
578 | 2195 | background-image: linear-gradient(to left, | ||
579 | 2196 | @places_sidebar_bg 39px, | ||
580 | 2197 | @places_sidebar_selected_bg_color 39px, | ||
581 | 2198 | @places_sidebar_selected_bg_color 100%); | ||
582 | 2199 | } | ||
583 | 2200 | |||
584 | 2201 | placessidebar.sidebar row.sidebar-row:selected:hover:backdrop, | ||
585 | 2202 | placessidebar.sidebar row.sidebar-row:active:hover:backdrop { | ||
586 | 2203 | background-image: linear-gradient(to right, | ||
587 | 2204 | @places_sidebar_backdrop_bg 39px, | ||
588 | 2205 | alpha(@backdrop_selected_bg_color, 0.4) 39px, | ||
589 | 2206 | alpha(@backdrop_selected_bg_color, 0.4) 100%); | ||
590 | 2207 | color: @backdrop_selected_fg_color; | ||
591 | 2208 | } | ||
592 | 2209 | |||
593 | 2210 | placessidebar.sidebar row.sidebar-row:selected:hover:backdrop:dir(rtl), | ||
594 | 2211 | placessidebar.sidebar row.sidebar-row:active:hover:backdrop:dir(rtl) { | ||
595 | 2212 | background-image: linear-gradient(to left, | ||
596 | 2213 | @places_sidebar_backdrop_bg 39px, | ||
597 | 2214 | alpha(@backdrop_selected_bg_color, 0.4) 39px, | ||
598 | 2215 | alpha(@backdrop_selected_bg_color, 0.4) 100%); | ||
599 | 2216 | } | ||
600 | 2217 | |||
601 | 2218 | placessidebar.sidebar row.sidebar-row:selected, | ||
602 | 2219 | placessidebar.sidebar row.sidebar-row:active { | ||
603 | 2220 | background-color: @places_sidebar_bg; | ||
604 | 2221 | color: shade(@places_sidebar_selected_bg_color, 1.03); | ||
605 | 2222 | text-shadow: 0 1px alpha (shade (@places_sidebar_selected_bg_color, 0.3), 0.5); | ||
606 | 2223 | } | ||
607 | 2224 | |||
608 | 2225 | placessidebar.sidebar row.sidebar-row:selected:backdrop, | ||
609 | 2226 | placessidebar.sidebar row.sidebar-row:active:backdrop { | ||
610 | 2227 | background-color: @places_sidebar_backdrop_bg; | ||
611 | 2228 | color: mix(shade(@places_sidebar_selected_bg_color, 1.03), shade(@places_sidebar_fg_color, 0.9), 0.3); | ||
612 | 2229 | text-shadow: 0 1px alpha (shade (@places_sidebar_selected_bg_color, 0.4), 0.4); | ||
613 | 2230 | } | ||
614 | 2231 | |||
615 | 2232 | placessidebar.sidebar row.sidebar-row .sidebar-icon { | ||
616 | 2233 | text-shadow: none; | ||
617 | 2234 | background-image: none; | ||
618 | 2235 | padding-left: 12px; | ||
619 | 2236 | padding-right: 12px; | ||
620 | 2237 | } | ||
621 | 2238 | |||
622 | 2239 | placessidebar.sidebar row.sidebar-row .sidebar-icon:dir(ltr) { | ||
623 | 2240 | margin-left: 0; | ||
624 | 2241 | margin-right: 12px; | ||
625 | 2242 | } | ||
626 | 2243 | |||
627 | 2244 | placessidebar.sidebar row.sidebar-row .sidebar-icon:dir(rtl) { | ||
628 | 2245 | margin-left: 12px; | ||
629 | 2246 | margin-right: 0; | ||
630 | 2247 | } | ||
631 | 2248 | |||
632 | 2249 | placessidebar.sidebar row.sidebar-row:hover .sidebar-icon:backdrop { | ||
633 | 2250 | color: @places_sidebar_fg_color; | ||
634 | 2251 | } | ||
635 | 2252 | |||
636 | 2253 | placessidebar.sidebar row.sidebar-row:selected.has-open-popup .sidebar-icon, | ||
637 | 2254 | placessidebar.sidebar row.sidebar-row:selected .sidebar-icon, | ||
638 | 2255 | placessidebar.sidebar row.sidebar-row:active:hover .sidebar-icon { | ||
639 | 2256 | color: @places_sidebar_selected_bg_color; | ||
640 | 2257 | background-color: transparent; | ||
641 | 2258 | } | ||
642 | 2259 | |||
643 | 2260 | placessidebar.sidebar row.sidebar-row:selected.has-open-popup .sidebar-icon:backdrop, | ||
644 | 2261 | placessidebar.sidebar row.sidebar-row:selected .sidebar-icon:backdrop { | ||
645 | 2262 | color: mix(shade(@places_sidebar_selected_bg_color, 1.03), shade(@places_sidebar_fg_color, 0.9), 0.3); | ||
646 | 2138 | } | 2263 | } |
647 | 2139 | 2264 | ||
648 | 2140 | .sidebar, | 2265 | .sidebar, |
649 | @@ -3252,10 +3377,20 @@ | |||
650 | 3252 | * popover * | 3377 | * popover * |
651 | 3253 | ************/ | 3378 | ************/ |
652 | 3254 | popover { | 3379 | popover { |
654 | 3255 | background-clip: border-box; | 3380 | background-image: linear-gradient(to bottom left, |
655 | 3381 | shade (@bg_color, 0.98), | ||
656 | 3382 | shade (@bg_color, 0.93), | ||
657 | 3383 | shade (@bg_color, 0.98)); | ||
658 | 3384 | border-radius: 5px; | ||
659 | 3385 | border: none; | ||
660 | 3386 | padding: 2px; | ||
661 | 3387 | } | ||
662 | 3256 | 3388 | ||
663 | 3389 | popover:backdrop { | ||
664 | 3390 | background-image: none; | ||
665 | 3391 | background-color: shade (@bg_color, 0.95); | ||
666 | 3257 | border-radius: 5px; | 3392 | border-radius: 5px; |
668 | 3258 | border: 1px solid darker(@bg_color); | 3393 | border: none; |
669 | 3259 | padding: 2px; | 3394 | padding: 2px; |
670 | 3260 | } | 3395 | } |
671 | 3261 | 3396 | ||
672 | @@ -3284,8 +3419,14 @@ | |||
673 | 3284 | popover menuitem:backdrop:hover { | 3419 | popover menuitem:backdrop:hover { |
674 | 3285 | border: none; | 3420 | border: none; |
675 | 3286 | border-image: none; | 3421 | border-image: none; |
677 | 3287 | background: transparent; | 3422 | border-radius: 3px; |
678 | 3423 | box-shadow: none; | ||
679 | 3424 | background-color: transparent; | ||
680 | 3425 | background-image: -gtk-gradient (linear, left bottom, left top, | ||
681 | 3426 | from (shade (@backdrop_selected_bg_color, 0.95)), | ||
682 | 3427 | to (shade (@backdrop_selected_bg_color, 0.90))); | ||
683 | 3288 | color: @fg_color; | 3428 | color: @fg_color; |
684 | 3429 | text-shadow: 0 -1px alpha (shade (@fg_color, 1.45), 0.7); | ||
685 | 3289 | } | 3430 | } |
686 | 3290 | 3431 | ||
687 | 3291 | popover modelbutton:checked, | 3432 | popover modelbutton:checked, |
688 | @@ -3310,7 +3451,6 @@ | |||
689 | 3310 | background: none; | 3451 | background: none; |
690 | 3311 | } | 3452 | } |
691 | 3312 | 3453 | ||
692 | 3313 | |||
693 | 3314 | /* menu buttons inside popovers */ | 3454 | /* menu buttons inside popovers */ |
694 | 3315 | modelbutton.flat, | 3455 | modelbutton.flat, |
695 | 3316 | popover.background checkbutton, | 3456 | popover.background checkbutton, |
LGTM. The only problem that I can see is the style of the buttons that appears for removable icons. Considering that UIFe is today we can fix it later.