Merge lp:~christhehorton/salience/round_glossy_buttons_branch into lp:salience
- round_glossy_buttons_branch
- Merge into trunk
Status: | Rejected |
---|---|
Rejected by: | Christopher Kyle Horton |
Proposed branch: | lp:~christhehorton/salience/round_glossy_buttons_branch |
Merge into: | lp:salience |
Diff against target: |
1085 lines (+486/-218) 9 files modified
gtk-2.0/Range/slider-bg-hover.svg (+152/-104) gtk-2.0/Range/slider-bg.svg (+111/-57) gtk-2.0/gtkrc (+13/-6) gtk-3.0/apps/gcalctool.css (+18/-0) gtk-3.0/button.css (+65/-39) gtk-3.0/gtk-widgets.css (+16/-8) gtk-3.0/scale.css (+18/-4) gtk-3.0/spin_button.css (+50/-0) gtk-3.0/switch.css (+43/-0) |
To merge this branch: | bzr merge lp:~christhehorton/salience/round_glossy_buttons_branch |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Christopher Kyle Horton | Disapprove | ||
Review via email: mp+122424@code.launchpad.net |
Commit message
Make buttons have rounded ends, apply gloss to anything clickable, and reduce border contrast.
Description of the change
Buttons in this branch now have:
* Rounded ends
* Gloss (applied to anything meant to be clickable)
* Less noticeable borders (reduction in contrast for a subtler look)
This branch represents a major style change from the current look in trunk.
- 103. By Christopher Kyle Horton
-
Change GTK+3 sliders to look more like the GTK+2 ones, without using an image.
- 104. By Christopher Kyle Horton
-
Remove seemingly useless border code for now.
- 105. By Christopher Kyle Horton
-
Slightly tone down button gloss a bit more.
- 106. By Christopher Kyle Horton
-
Use square buttons in Calculator.
- 107. By Christopher Kyle Horton
-
Give the entry area in Calculator an indented look.
Christopher Kyle Horton (christhehorton) : | # |
Aditya V (kroq-gar78) wrote : | # |
Christopher Kyle Horton (christhehorton) wrote : | # |
I eventually came to the conclusion that these changes just didn't quite
fit our overall vision for Salience. The disapproval merely indicates that
we will not accept these particular changes.
I am turning my attention back to trunk and the bug fix branches.
On Sep 6, 2012 6:31 PM, "kroq-gar78" <email address hidden> wrote:
> Wait, why disapprove?
>
> --
>
> https:/
> You are the owner of
> lp:~christhehorton/salience/round_glossy_buttons_branch.
>
Aditya V (kroq-gar78) wrote : | # |
Ah I see. If you want, you can also set it to "Work in progress".
Sincerely,
kroq-gar78
On Thu, Sep 6, 2012 at 6:10 PM, Christopher Kyle Horton <
<email address hidden>> wrote:
> I eventually came to the conclusion that these changes just didn't quite
> fit our overall vision for Salience. The disapproval merely indicates that
> we will not accept these particular changes.
>
> I am turning my attention back to trunk and the bug fix branches.
> On Sep 6, 2012 6:31 PM, "kroq-gar78" <email address hidden> wrote:
>
> > Wait, why disapprove?
> >
> > --
> >
> >
> https:/
> > You are the owner of
> > lp:~christhehorton/salience/round_glossy_buttons_branch.
> >
>
> --
>
> https:/
> Your team Salience Team is subscribed to branch lp:salience.
>
Unmerged revisions
- 107. By Christopher Kyle Horton
-
Give the entry area in Calculator an indented look.
- 106. By Christopher Kyle Horton
-
Use square buttons in Calculator.
- 105. By Christopher Kyle Horton
-
Slightly tone down button gloss a bit more.
- 104. By Christopher Kyle Horton
-
Remove seemingly useless border code for now.
- 103. By Christopher Kyle Horton
-
Change GTK+3 sliders to look more like the GTK+2 ones, without using an image.
- 102. By Christopher Kyle Horton
-
Merge from trunk (scale trough contrast adjustment).
- 101. By Christopher Kyle Horton
-
Merge from trunk (updated GTK+2 scales).
- 100. By Christopher Kyle Horton
-
Make entry box borders less noticeable.
- 99. By Christopher Kyle Horton
-
Unround GTK+2 spinbuttons.
- 98. By Christopher Kyle Horton
-
Merge from trunk (GTK+2 link color).
Preview Diff
1 | === modified file 'gtk-2.0/Range/slider-bg-hover.svg' |
2 | --- gtk-2.0/Range/slider-bg-hover.svg 2012-07-08 23:19:26 +0000 |
3 | +++ gtk-2.0/Range/slider-bg-hover.svg 2012-09-03 20:38:20 +0000 |
4 | @@ -8,156 +8,184 @@ |
5 | xmlns:svg="http://www.w3.org/2000/svg" |
6 | xmlns="http://www.w3.org/2000/svg" |
7 | xmlns:xlink="http://www.w3.org/1999/xlink" |
8 | - version="1.1" |
9 | + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
10 | + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
11 | width="20" |
12 | height="20" |
13 | - id="svg2"> |
14 | + id="svg2" |
15 | + version="1.1" |
16 | + inkscape:version="0.48.3.1 r9886" |
17 | + sodipodi:docname="slider-normal.svg"> |
18 | <defs |
19 | id="defs4"> |
20 | <linearGradient |
21 | - id="linearGradient3821"> |
22 | - <stop |
23 | - id="stop3823" |
24 | - style="stop-color:#000000;stop-opacity:1" |
25 | - offset="0" /> |
26 | - <stop |
27 | - id="stop3825" |
28 | - style="stop-color:#000000;stop-opacity:0" |
29 | - offset="1" /> |
30 | - </linearGradient> |
31 | - <linearGradient |
32 | - id="linearGradient3813"> |
33 | - <stop |
34 | - id="stop3815" |
35 | - style="stop-color:#ff4200;stop-opacity:1" |
36 | - offset="0" /> |
37 | - <stop |
38 | - id="stop3831" |
39 | - style="stop-color:#ff4200;stop-opacity:0.49803922" |
40 | - offset="0.91025639" /> |
41 | - <stop |
42 | - id="stop3829" |
43 | - style="stop-color:#ff4200;stop-opacity:0" |
44 | - offset="1" /> |
45 | + id="linearGradient3877"> |
46 | + <stop |
47 | + style="stop-color:#f13e00;stop-opacity:1;" |
48 | + offset="0" |
49 | + id="stop3879" /> |
50 | + <stop |
51 | + id="stop3887" |
52 | + offset="0.89999998" |
53 | + style="stop-color:#f13e00;stop-opacity:1;" /> |
54 | + <stop |
55 | + style="stop-color:#f13e00;stop-opacity:0;" |
56 | + offset="1" |
57 | + id="stop3881" /> |
58 | </linearGradient> |
59 | <linearGradient |
60 | id="linearGradient3796"> |
61 | <stop |
62 | - id="stop3798" |
63 | - style="stop-color:#ffffff;stop-opacity:1" |
64 | - offset="0" /> |
65 | + style="stop-color:#c8c8c8;stop-opacity:1;" |
66 | + offset="0" |
67 | + id="stop3798" /> |
68 | + <stop |
69 | + id="stop3776" |
70 | + offset="0.45269749" |
71 | + style="stop-color:#505050;stop-opacity:1;" /> |
72 | <stop |
73 | id="stop3800" |
74 | - style="stop-color:#707070;stop-opacity:1" |
75 | - offset="0.54000002" /> |
76 | - <stop |
77 | - id="stop3802" |
78 | - style="stop-color:#3c3c3c;stop-opacity:1" |
79 | - offset="0.70255846" /> |
80 | + offset="0.46212858" |
81 | + style="stop-color:#505050;stop-opacity:1;" /> |
82 | + <stop |
83 | + style="stop-color:#1e1e1e;stop-opacity:1;" |
84 | + offset="0.49503547" |
85 | + id="stop3772" /> |
86 | + <stop |
87 | + id="stop3778" |
88 | + offset="0.63788778" |
89 | + style="stop-color:#2b2b2b;stop-opacity:1;" /> |
90 | + <stop |
91 | + style="stop-color:#505050;stop-opacity:1;" |
92 | + offset="0.73210955" |
93 | + id="stop3802" /> |
94 | </linearGradient> |
95 | <linearGradient |
96 | id="linearGradient3779"> |
97 | <stop |
98 | id="stop3781" |
99 | - style="stop-color:#c8c8c8;stop-opacity:1" |
100 | - offset="0" /> |
101 | + offset="0" |
102 | + style="stop-color:#c8c8c8;stop-opacity:1;" /> |
103 | <stop |
104 | - id="stop3792" |
105 | - style="stop-color:#969696;stop-opacity:1" |
106 | - offset="0.25071225" /> |
107 | + style="stop-color:#969696;stop-opacity:1;" |
108 | + offset="0.25071225" |
109 | + id="stop3792" /> |
110 | <stop |
111 | id="stop3783" |
112 | - style="stop-color:#141414;stop-opacity:1" |
113 | - offset="0.44444442" /> |
114 | + offset="0.44444442" |
115 | + style="stop-color:#141414;stop-opacity:1;" /> |
116 | </linearGradient> |
117 | <linearGradient |
118 | id="linearGradient3757"> |
119 | <stop |
120 | - id="stop3759" |
121 | - style="stop-color:#3c3c3c;stop-opacity:1" |
122 | - offset="0" /> |
123 | + style="stop-color:#1e1e1e;stop-opacity:1;" |
124 | + offset="0" |
125 | + id="stop3759" /> |
126 | <stop |
127 | - id="stop3761" |
128 | - style="stop-color:#c8c8c8;stop-opacity:1" |
129 | - offset="0.625" /> |
130 | + style="stop-color:#969696;stop-opacity:1;" |
131 | + offset="0.49833888" |
132 | + id="stop3761" /> |
133 | </linearGradient> |
134 | <linearGradient |
135 | + inkscape:collect="always" |
136 | + xlink:href="#linearGradient3757" |
137 | + id="linearGradient3775" |
138 | x1="10" |
139 | y1="18" |
140 | x2="10" |
141 | y2="2" |
142 | - id="linearGradient3775" |
143 | - xlink:href="#linearGradient3757" |
144 | gradientUnits="userSpaceOnUse" /> |
145 | <radialGradient |
146 | + inkscape:collect="always" |
147 | + xlink:href="#linearGradient3779" |
148 | + id="radialGradient3777" |
149 | cx="10" |
150 | cy="6.9316244" |
151 | - r="8.5" |
152 | fx="10" |
153 | fy="6.9316244" |
154 | - id="radialGradient3777" |
155 | - xlink:href="#linearGradient3779" |
156 | + r="8.5" |
157 | gradientUnits="userSpaceOnUse" |
158 | gradientTransform="matrix(1.5294118,0,0,1.5294117,-5.2941179,-3.6013072)" /> |
159 | <filter |
160 | - color-interpolation-filters="sRGB" |
161 | - id="filter3785"> |
162 | + id="filter3785" |
163 | + style="color-interpolation-filters:sRGB;" |
164 | + inkscape:label="Drop Shadow"> |
165 | <feFlood |
166 | - result="flood" |
167 | + id="feFlood3787" |
168 | + flood-opacity="0.5" |
169 | flood-color="rgb(0,0,0)" |
170 | - flood-opacity="0.5" |
171 | - id="feFlood3787" /> |
172 | + result="flood" /> |
173 | <feComposite |
174 | + id="feComposite3789" |
175 | in2="SourceGraphic" |
176 | + in="flood" |
177 | operator="in" |
178 | - in="flood" |
179 | - result="composite1" |
180 | - id="feComposite3789" /> |
181 | + result="composite1" /> |
182 | <feGaussianBlur |
183 | - result="blur" |
184 | + id="feGaussianBlur3791" |
185 | + in="composite" |
186 | stdDeviation="2" |
187 | - id="feGaussianBlur3791" /> |
188 | + result="blur" /> |
189 | <feOffset |
190 | - result="offset" |
191 | + id="feOffset3793" |
192 | + dx="-2.47025e-15" |
193 | dy="1" |
194 | - dx="-2.47025e-15" |
195 | - id="feOffset3793" /> |
196 | + result="offset" /> |
197 | <feComposite |
198 | + id="feComposite3795" |
199 | in2="offset" |
200 | + in="SourceGraphic" |
201 | operator="over" |
202 | - in="SourceGraphic" |
203 | - result="composite2" |
204 | - id="feComposite3795" /> |
205 | + result="composite2" /> |
206 | </filter> |
207 | <radialGradient |
208 | - cx="10" |
209 | - cy="6.8078303" |
210 | - r="8.5" |
211 | - fx="10" |
212 | - fy="6.8078303" |
213 | + inkscape:collect="always" |
214 | + xlink:href="#linearGradient3796" |
215 | id="radialGradient3788" |
216 | - xlink:href="#linearGradient3796" |
217 | gradientUnits="userSpaceOnUse" |
218 | - gradientTransform="matrix(1.3772074,0,0,1.3418481,-3.7720742,-2.3011865)" /> |
219 | - <radialGradient |
220 | - cx="10" |
221 | - cy="10" |
222 | - r="10" |
223 | - fx="10" |
224 | - fy="10" |
225 | - id="radialGradient3819" |
226 | - xlink:href="#linearGradient3813" |
227 | - gradientUnits="userSpaceOnUse" /> |
228 | - <radialGradient |
229 | - cx="10" |
230 | - cy="10" |
231 | - r="10" |
232 | - fx="10" |
233 | - fy="10" |
234 | - id="radialGradient3827" |
235 | - xlink:href="#linearGradient3813" |
236 | + gradientTransform="matrix(2.3807487,0,0,2.3196239,-13.807487,-5.4353683)" |
237 | + cx="10" |
238 | + cy="3.2054198" |
239 | + fx="10" |
240 | + fy="3.2054198" |
241 | + r="8.5" /> |
242 | + <radialGradient |
243 | + inkscape:collect="always" |
244 | + xlink:href="#linearGradient3877" |
245 | + id="radialGradient3885" |
246 | + cx="10" |
247 | + cy="10" |
248 | + fx="10" |
249 | + fy="10" |
250 | + r="10" |
251 | gradientUnits="userSpaceOnUse" /> |
252 | </defs> |
253 | + <sodipodi:namedview |
254 | + id="base" |
255 | + pagecolor="#ffffff" |
256 | + bordercolor="#666666" |
257 | + borderopacity="1.0" |
258 | + inkscape:pageopacity="0.0" |
259 | + inkscape:pageshadow="2" |
260 | + inkscape:zoom="1" |
261 | + inkscape:cx="10" |
262 | + inkscape:cy="10" |
263 | + inkscape:document-units="px" |
264 | + inkscape:current-layer="layer1" |
265 | + showgrid="false" |
266 | + inkscape:window-width="1301" |
267 | + inkscape:window-height="744" |
268 | + inkscape:window-x="65" |
269 | + inkscape:window-y="24" |
270 | + inkscape:window-maximized="1"> |
271 | + <inkscape:grid |
272 | + type="xygrid" |
273 | + id="grid2985" |
274 | + empspacing="1" |
275 | + visible="true" |
276 | + enabled="true" |
277 | + snapvisiblegridlinesonly="true" /> |
278 | + </sodipodi:namedview> |
279 | <metadata |
280 | id="metadata7"> |
281 | <rdf:RDF> |
282 | @@ -171,19 +199,39 @@ |
283 | </rdf:RDF> |
284 | </metadata> |
285 | <g |
286 | - id="layer2"> |
287 | + inkscape:label="Layer 1" |
288 | + inkscape:groupmode="layer" |
289 | + id="layer1" |
290 | + transform="translate(0,-1032.3622)"> |
291 | <path |
292 | + sodipodi:type="arc" |
293 | + style="fill:url(#radialGradient3885);fill-opacity:1.0;stroke:#fa7600;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" |
294 | + id="path3875" |
295 | + sodipodi:cx="10" |
296 | + sodipodi:cy="10" |
297 | + sodipodi:rx="10" |
298 | + sodipodi:ry="10" |
299 | d="M 20,10 A 10,10 0 1 1 0,10 10,10 0 1 1 20,10 z" |
300 | - id="path3811" |
301 | - style="fill:url(#radialGradient3827);fill-opacity:1;stroke:url(#radialGradient3819);stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.39215686;stroke-dasharray:none" /> |
302 | - </g> |
303 | - <g |
304 | - transform="translate(0,-1032.3622)" |
305 | - id="layer1"> |
306 | - <path |
307 | - d="M 18,10 A 8,8 0 1 1 2,10 8,8 0 1 1 18,10 z" |
308 | + transform="translate(0,1032.3622)" /> |
309 | + <path |
310 | + sodipodi:type="arc" |
311 | + style="fill:url(#radialGradient3788);fill-opacity:1;stroke:url(#linearGradient3775);stroke-width:0.80000000000000004;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" |
312 | + id="path2987" |
313 | + sodipodi:cx="10" |
314 | + sodipodi:cy="10" |
315 | + sodipodi:rx="8" |
316 | + sodipodi:ry="8" |
317 | + d="m 18,10 c 0,4.418278 -3.581722,8 -8,8 -4.418278,0 -8,-3.581722 -8,-8 0,-4.418278 3.581722,-8 8,-8 4.418278,0 8,3.581722 8,8 z" |
318 | + transform="translate(0,1032.3622)" /> |
319 | + <path |
320 | transform="translate(0,1032.3622)" |
321 | - id="path2987" |
322 | - style="fill:url(#radialGradient3788);fill-opacity:1;stroke:url(#linearGradient3775);stroke-width:0.80000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> |
323 | + d="m 18,10 c 0,4.418278 -3.581722,8 -8,8 -4.418278,0 -8,-3.581722 -8,-8 0,-4.418278 3.581722,-8 8,-8 4.418278,0 8,3.581722 8,8 z" |
324 | + sodipodi:ry="8" |
325 | + sodipodi:rx="8" |
326 | + sodipodi:cy="10" |
327 | + sodipodi:cx="10" |
328 | + id="path3799" |
329 | + style="fill:#ffffff;fill-opacity:0.09803922;stroke:url(#linearGradient3775);stroke-width:0.80000000000000004;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" |
330 | + sodipodi:type="arc" /> |
331 | </g> |
332 | </svg> |
333 | |
334 | === modified file 'gtk-2.0/Range/slider-bg.svg' |
335 | --- gtk-2.0/Range/slider-bg.svg 2012-07-08 23:13:17 +0000 |
336 | +++ gtk-2.0/Range/slider-bg.svg 2012-09-03 20:38:20 +0000 |
337 | @@ -8,112 +8,159 @@ |
338 | xmlns:svg="http://www.w3.org/2000/svg" |
339 | xmlns="http://www.w3.org/2000/svg" |
340 | xmlns:xlink="http://www.w3.org/1999/xlink" |
341 | - version="1.1" |
342 | + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
343 | + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
344 | width="20" |
345 | height="20" |
346 | - id="svg2"> |
347 | + id="svg2" |
348 | + version="1.1" |
349 | + inkscape:version="0.48.3.1 r9886" |
350 | + sodipodi:docname="slider-normal.svg"> |
351 | <defs |
352 | id="defs4"> |
353 | <linearGradient |
354 | id="linearGradient3796"> |
355 | <stop |
356 | - id="stop3798" |
357 | - style="stop-color:#ffffff;stop-opacity:1" |
358 | - offset="0" /> |
359 | + style="stop-color:#c8c8c8;stop-opacity:1;" |
360 | + offset="0" |
361 | + id="stop3798" /> |
362 | + <stop |
363 | + id="stop3776" |
364 | + offset="0.45269749" |
365 | + style="stop-color:#505050;stop-opacity:1;" /> |
366 | <stop |
367 | id="stop3800" |
368 | - style="stop-color:#383838;stop-opacity:1" |
369 | - offset="0.54000002" /> |
370 | - <stop |
371 | - id="stop3802" |
372 | - style="stop-color:#1e1e1e;stop-opacity:1" |
373 | - offset="0.70255846" /> |
374 | + offset="0.46212858" |
375 | + style="stop-color:#505050;stop-opacity:1;" /> |
376 | + <stop |
377 | + style="stop-color:#1e1e1e;stop-opacity:1;" |
378 | + offset="0.49503547" |
379 | + id="stop3772" /> |
380 | + <stop |
381 | + id="stop3778" |
382 | + offset="0.63788778" |
383 | + style="stop-color:#2b2b2b;stop-opacity:1;" /> |
384 | + <stop |
385 | + style="stop-color:#505050;stop-opacity:1;" |
386 | + offset="0.73210955" |
387 | + id="stop3802" /> |
388 | </linearGradient> |
389 | <linearGradient |
390 | id="linearGradient3779"> |
391 | <stop |
392 | id="stop3781" |
393 | - style="stop-color:#c8c8c8;stop-opacity:1" |
394 | - offset="0" /> |
395 | + offset="0" |
396 | + style="stop-color:#c8c8c8;stop-opacity:1;" /> |
397 | <stop |
398 | - id="stop3792" |
399 | - style="stop-color:#969696;stop-opacity:1" |
400 | - offset="0.25071225" /> |
401 | + style="stop-color:#969696;stop-opacity:1;" |
402 | + offset="0.25071225" |
403 | + id="stop3792" /> |
404 | <stop |
405 | id="stop3783" |
406 | - style="stop-color:#141414;stop-opacity:1" |
407 | - offset="0.44444442" /> |
408 | + offset="0.44444442" |
409 | + style="stop-color:#141414;stop-opacity:1;" /> |
410 | </linearGradient> |
411 | <linearGradient |
412 | id="linearGradient3757"> |
413 | <stop |
414 | - id="stop3759" |
415 | - style="stop-color:#1e1e1e;stop-opacity:1" |
416 | - offset="0" /> |
417 | + style="stop-color:#1e1e1e;stop-opacity:1;" |
418 | + offset="0" |
419 | + id="stop3759" /> |
420 | <stop |
421 | - id="stop3761" |
422 | - style="stop-color:#969696;stop-opacity:1" |
423 | - offset="0.625" /> |
424 | + style="stop-color:#969696;stop-opacity:1;" |
425 | + offset="0.49833888" |
426 | + id="stop3761" /> |
427 | </linearGradient> |
428 | <linearGradient |
429 | + inkscape:collect="always" |
430 | + xlink:href="#linearGradient3757" |
431 | + id="linearGradient3775" |
432 | x1="10" |
433 | y1="18" |
434 | x2="10" |
435 | y2="2" |
436 | - id="linearGradient3775" |
437 | - xlink:href="#linearGradient3757" |
438 | gradientUnits="userSpaceOnUse" /> |
439 | <radialGradient |
440 | + inkscape:collect="always" |
441 | + xlink:href="#linearGradient3779" |
442 | + id="radialGradient3777" |
443 | cx="10" |
444 | cy="6.9316244" |
445 | - r="8.5" |
446 | fx="10" |
447 | fy="6.9316244" |
448 | - id="radialGradient3777" |
449 | - xlink:href="#linearGradient3779" |
450 | + r="8.5" |
451 | gradientUnits="userSpaceOnUse" |
452 | gradientTransform="matrix(1.5294118,0,0,1.5294117,-5.2941179,-3.6013072)" /> |
453 | <filter |
454 | - color-interpolation-filters="sRGB" |
455 | - id="filter3785"> |
456 | + id="filter3785" |
457 | + style="color-interpolation-filters:sRGB;" |
458 | + inkscape:label="Drop Shadow"> |
459 | <feFlood |
460 | - result="flood" |
461 | + id="feFlood3787" |
462 | + flood-opacity="0.5" |
463 | flood-color="rgb(0,0,0)" |
464 | - flood-opacity="0.5" |
465 | - id="feFlood3787" /> |
466 | + result="flood" /> |
467 | <feComposite |
468 | + id="feComposite3789" |
469 | in2="SourceGraphic" |
470 | + in="flood" |
471 | operator="in" |
472 | - in="flood" |
473 | - result="composite1" |
474 | - id="feComposite3789" /> |
475 | + result="composite1" /> |
476 | <feGaussianBlur |
477 | - result="blur" |
478 | + id="feGaussianBlur3791" |
479 | + in="composite" |
480 | stdDeviation="2" |
481 | - id="feGaussianBlur3791" /> |
482 | + result="blur" /> |
483 | <feOffset |
484 | - result="offset" |
485 | + id="feOffset3793" |
486 | + dx="-2.47025e-15" |
487 | dy="1" |
488 | - dx="-2.47025e-15" |
489 | - id="feOffset3793" /> |
490 | + result="offset" /> |
491 | <feComposite |
492 | + id="feComposite3795" |
493 | in2="offset" |
494 | + in="SourceGraphic" |
495 | operator="over" |
496 | - in="SourceGraphic" |
497 | - result="composite2" |
498 | - id="feComposite3795" /> |
499 | + result="composite2" /> |
500 | </filter> |
501 | <radialGradient |
502 | - cx="10" |
503 | - cy="6.8078303" |
504 | - r="8.5" |
505 | - fx="10" |
506 | - fy="6.8078303" |
507 | + inkscape:collect="always" |
508 | + xlink:href="#linearGradient3796" |
509 | id="radialGradient3788" |
510 | - xlink:href="#linearGradient3796" |
511 | gradientUnits="userSpaceOnUse" |
512 | - gradientTransform="matrix(1.3772074,0,0,1.3418481,-3.7720742,-2.3011865)" /> |
513 | + gradientTransform="matrix(2.3807487,0,0,2.3196239,-13.807487,-5.4353683)" |
514 | + cx="10" |
515 | + cy="3.2054198" |
516 | + fx="10" |
517 | + fy="3.2054198" |
518 | + r="8.5" /> |
519 | </defs> |
520 | + <sodipodi:namedview |
521 | + id="base" |
522 | + pagecolor="#ffffff" |
523 | + bordercolor="#666666" |
524 | + borderopacity="1.0" |
525 | + inkscape:pageopacity="0.0" |
526 | + inkscape:pageshadow="2" |
527 | + inkscape:zoom="1" |
528 | + inkscape:cx="10" |
529 | + inkscape:cy="10" |
530 | + inkscape:document-units="px" |
531 | + inkscape:current-layer="layer1" |
532 | + showgrid="false" |
533 | + inkscape:window-width="1301" |
534 | + inkscape:window-height="744" |
535 | + inkscape:window-x="65" |
536 | + inkscape:window-y="24" |
537 | + inkscape:window-maximized="1"> |
538 | + <inkscape:grid |
539 | + type="xygrid" |
540 | + id="grid2985" |
541 | + empspacing="1" |
542 | + visible="true" |
543 | + enabled="true" |
544 | + snapvisiblegridlinesonly="true" /> |
545 | + </sodipodi:namedview> |
546 | <metadata |
547 | id="metadata7"> |
548 | <rdf:RDF> |
549 | @@ -127,12 +174,19 @@ |
550 | </rdf:RDF> |
551 | </metadata> |
552 | <g |
553 | - transform="translate(0,-1032.3622)" |
554 | - id="layer1"> |
555 | + inkscape:label="Layer 1" |
556 | + inkscape:groupmode="layer" |
557 | + id="layer1" |
558 | + transform="translate(0,-1032.3622)"> |
559 | <path |
560 | - d="M 18,10 A 8,8 0 1 1 2,10 8,8 0 1 1 18,10 z" |
561 | - transform="translate(0,1032.3622)" |
562 | + sodipodi:type="arc" |
563 | + style="fill:url(#radialGradient3788);fill-opacity:1;stroke:url(#linearGradient3775);stroke-width:0.80000000000000004;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" |
564 | id="path2987" |
565 | - style="fill:url(#radialGradient3788);fill-opacity:1;stroke:url(#linearGradient3775);stroke-width:0.80000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> |
566 | + sodipodi:cx="10" |
567 | + sodipodi:cy="10" |
568 | + sodipodi:rx="8" |
569 | + sodipodi:ry="8" |
570 | + d="m 18,10 c 0,4.418278 -3.581722,8 -8,8 -4.418278,0 -8,-3.581722 -8,-8 0,-4.418278 3.581722,-8 8,-8 4.418278,0 8,3.581722 8,8 z" |
571 | + transform="translate(0,1032.3622)" /> |
572 | </g> |
573 | </svg> |
574 | |
575 | === modified file 'gtk-2.0/gtkrc' |
576 | --- gtk-2.0/gtkrc 2012-09-02 20:28:51 +0000 |
577 | +++ gtk-2.0/gtkrc 2012-09-03 20:38:20 +0000 |
578 | @@ -119,10 +119,10 @@ |
579 | { |
580 | animation = TRUE |
581 | arrowstyle = 1 |
582 | - border_shades = { 1.15, 0.85 } |
583 | + border_shades = { 1.1, 0.9 } |
584 | colorize_scrollbar = TRUE |
585 | contrast = 1.1 |
586 | - default_button_color = shade (1.05, @bg_color) |
587 | + default_button_color = shade (1.05, @bg_color) |
588 | focusstyle = 3 |
589 | glazestyle = 0 |
590 | gradient_shades = {1.26,1.09,1.08,0.80} |
591 | @@ -202,16 +202,23 @@ |
592 | bg[INSENSITIVE] = shade (0.95, @bg_color) |
593 | |
594 | engine "murrine" { |
595 | - border_shades = {0.66, 0.32} |
596 | + border_shades = {0.9, 0.8} |
597 | contrast = 1.20 |
598 | - gradient_shades = {1.18,1.01,1.02,0.78} |
599 | + gradient_shades = {1.25,1.05,0.9,1.1} |
600 | lightborderstyle = 1 |
601 | lightborder_shade = 1.26 |
602 | + roundness = 12 |
603 | textstyle = 4 |
604 | text_shade = 0.05 |
605 | } |
606 | } |
607 | |
608 | +style "murrine-spinbutton" = "murrine-button" { |
609 | + engine "murrine" { |
610 | + roundness = 3 |
611 | + } |
612 | +} |
613 | + |
614 | style "murrine-button-content" = "murrine-wider" { |
615 | |
616 | GtkWidget ::focus-line-width = 0 |
617 | @@ -287,7 +294,7 @@ |
618 | GtkWidget ::focus-padding = 1 |
619 | |
620 | bg[ACTIVE] = @bg_color |
621 | - bg[NORMAL] = shade(0.5, @bg_color) |
622 | + bg[NORMAL] = shade(0.9, @bg_color) |
623 | bg[PRELIGHT] = shade (1.13, @selected_bg_color) |
624 | bg[SELECTED] = shade (1.08, @selected_bg_color) |
625 | bg[INSENSITIVE] = @bg_color |
626 | @@ -678,7 +685,7 @@ |
627 | class "GtkInfoBar" style "murrine-default" |
628 | class "GtkIconView" style "murrine-default" |
629 | |
630 | -class "GtkSpinButton" style "murrine-button" |
631 | +class "GtkSpinButton" style "murrine-spinbutton" |
632 | |
633 | class "GtkScale" style "murrine-scale" |
634 | class "GtkVScale" style "murrine-scale" |
635 | |
636 | === added file 'gtk-3.0/apps/gcalctool.css' |
637 | --- gtk-3.0/apps/gcalctool.css 1970-01-01 00:00:00 +0000 |
638 | +++ gtk-3.0/apps/gcalctool.css 2012-09-03 20:38:20 +0000 |
639 | @@ -0,0 +1,18 @@ |
640 | +/************* |
641 | +* Calculator * |
642 | +**************/ |
643 | + |
644 | +/* gcalctool should have square buttons, not rounded */ |
645 | + |
646 | +MathWindow .button { |
647 | + border-radius: 3px; |
648 | + -unico-focus-border-radius: 3; |
649 | +} |
650 | + |
651 | +MathDisplay { |
652 | + background-image: -gtk-gradient (linear, |
653 | + left top, |
654 | + left bottom, |
655 | + color-stop (0, shade (@bg_color, 0.9)), |
656 | + color-stop (1, shade (@bg_color, 1.1))); |
657 | +} |
658 | |
659 | === modified file 'gtk-3.0/button.css' |
660 | --- gtk-3.0/button.css 2012-07-18 00:19:01 +0000 |
661 | +++ gtk-3.0/button.css 2012-09-03 20:38:20 +0000 |
662 | @@ -21,39 +21,45 @@ |
663 | background-image: -gtk-gradient (linear, |
664 | left top, |
665 | left bottom, |
666 | - from (shade (@bg_dark_color, 0.86)), |
667 | - to (shade (@bg_dark_color, 0.52))); |
668 | + color-stop (0, mix (#ffffff, @bg_color, 0.8)), |
669 | + color-stop (0.5, mix (#ffffff, @bg_color, 0.95)), |
670 | + color-stop (0.55, @bg_color), |
671 | + color-stop (0.8, shade (@bg_color, 0.9)), |
672 | + color-stop (1, shade (@bg_color, 1.1))); |
673 | |
674 | -unico-border-gradient: -gtk-gradient (linear, |
675 | left top, left bottom, |
676 | - from (shade (@bg_color, 0.72)), |
677 | - to (shade (@bg_color, 0.50))); |
678 | + from (shade (@bg_color, 0.9)), |
679 | + to (shade (@bg_color, 0.7))); |
680 | } |
681 | |
682 | .button:hover { |
683 | |
684 | background-image: -gtk-gradient (linear, |
685 | - left top, |
686 | - left bottom, |
687 | - from (shade (@bg_dark_color, 0.96)), |
688 | - to (shade (@bg_dark_color, 0.62))); |
689 | + left top, |
690 | + left bottom, |
691 | + color-stop (0, shade (mix (#ffffff, @bg_color, 0.8), 1.2)), |
692 | + color-stop (0.5, shade (mix (#ffffff, @bg_color, 0.95), 1.2)), |
693 | + color-stop (0.55, shade (@bg_color, 1.2)), |
694 | + color-stop (0.8, shade (shade (@bg_color, 0.9), 1.2)), |
695 | + color-stop (1, shade (shade (@bg_color, 1.1), 1.2))); |
696 | |
697 | -unico-border-gradient: -gtk-gradient (linear, |
698 | left top, left bottom, |
699 | - from (shade (@bg_color, 0.82)), |
700 | - to (shade (@bg_color, 0.60))); |
701 | + from (shade (@bg_color, 0.8)), |
702 | + to (shade (@bg_color, 0.6))); |
703 | |
704 | color: @selected_fg_color; |
705 | text-shadow: 0 -1 alpha (#000, 0.5), |
706 | - -1 -1 alpha (@selected_fg_color, 0.1), |
707 | - 1 -1 alpha (@selected_fg_color, 0.1), |
708 | - -1 1 alpha (@selected_fg_color, 0.1), |
709 | - 1 1 alpha (@selected_fg_color, 0.1); |
710 | + -1 -1 alpha (@selected_fg_color, 0.2), |
711 | + 1 -1 alpha (@selected_fg_color, 0.2), |
712 | + -1 1 alpha (@selected_fg_color, 0.2), |
713 | + 1 1 alpha (@selected_fg_color, 0.2); |
714 | icon-shadow: 0 -1 alpha (#000, 0.5), |
715 | - -1 -1 alpha (@selected_fg_color, 0.1), |
716 | - 1 -1 alpha (@selected_fg_color, 0.1), |
717 | - -1 1 alpha (@selected_fg_color, 0.1), |
718 | - 1 1 alpha (@selected_fg_color, 0.1); |
719 | + -1 -1 alpha (@selected_fg_color, 0.2), |
720 | + 1 -1 alpha (@selected_fg_color, 0.2), |
721 | + -1 1 alpha (@selected_fg_color, 0.2), |
722 | + 1 1 alpha (@selected_fg_color, 0.2); |
723 | } |
724 | |
725 | .button:active, |
726 | @@ -62,15 +68,18 @@ |
727 | .button:hover:active:focused { |
728 | |
729 | background-image: -gtk-gradient (linear, |
730 | - left top, |
731 | - left bottom, |
732 | - from (shade (@selected_bg_color, 0.75)), |
733 | - to (shade (@selected_bg_color, 1.24))); |
734 | + left top, |
735 | + left bottom, |
736 | + color-stop (0, mix (#ffffff, @selected_bg_color, 0.8)), |
737 | + color-stop (0.5, mix (#ffffff, @selected_bg_color, 0.95)), |
738 | + color-stop (0.55, @selected_bg_color), |
739 | + color-stop (0.8, shade (@selected_bg_color, 0.9)), |
740 | + color-stop (1, shade (@selected_bg_color, 1.1))); |
741 | |
742 | -unico-border-gradient: -gtk-gradient (linear, |
743 | - left top, left bottom, |
744 | - from (shade (@bg_color, 0.54)), |
745 | - to (shade (@bg_color, 0.68))); |
746 | + left top, left bottom, |
747 | + from (shade (@selected_bg_color, 0.9)), |
748 | + to (shade (@selected_bg_color, 0.7))); |
749 | |
750 | -unico-inner-stroke-width: 1px; |
751 | -unico-inner-stroke-gradient: -gtk-gradient (linear, |
752 | @@ -80,15 +89,15 @@ |
753 | |
754 | color: @selected_fg_color; |
755 | text-shadow: 0 -1 alpha (#000, 0.5), |
756 | - -1 -1 alpha (@selected_fg_color, 0.1), |
757 | - 1 -1 alpha (@selected_fg_color, 0.1), |
758 | - -1 1 alpha (@selected_fg_color, 0.1), |
759 | - 1 1 alpha (@selected_fg_color, 0.1); |
760 | + -1 -1 alpha (@selected_fg_color, 0.2), |
761 | + 1 -1 alpha (@selected_fg_color, 0.2), |
762 | + -1 1 alpha (@selected_fg_color, 0.2), |
763 | + 1 1 alpha (@selected_fg_color, 0.2); |
764 | icon-shadow: 0 -1 alpha (#000, 0.5), |
765 | - -1 -1 alpha (@selected_fg_color, 0.1), |
766 | - 1 -1 alpha (@selected_fg_color, 0.1), |
767 | - -1 1 alpha (@selected_fg_color, 0.1), |
768 | - 1 1 alpha (@selected_fg_color, 0.1); |
769 | + -1 -1 alpha (@selected_fg_color, 0.2), |
770 | + 1 -1 alpha (@selected_fg_color, 0.2), |
771 | + -1 1 alpha (@selected_fg_color, 0.2), |
772 | + 1 1 alpha (@selected_fg_color, 0.2); |
773 | } |
774 | |
775 | .button:insensitive, |
776 | @@ -98,7 +107,7 @@ |
777 | background-color: transparent; |
778 | |
779 | -unico-outer-stroke-width: 0; |
780 | - -unico-border-color: shade (@bg_color, 0.60); |
781 | + -unico-border-color: shade (@bg_color, 0.7); |
782 | } |
783 | |
784 | .button:active:insensitive, |
785 | @@ -129,16 +138,25 @@ |
786 | |
787 | -unico-border-gradient: -gtk-gradient (linear, |
788 | left top, left bottom, |
789 | - from (shade (@bg_color, 0.76)), |
790 | - to (shade (@bg_color, 0.68))); |
791 | + from (shade (@bg_color, 0.9)), |
792 | + to (shade (@bg_color, 0.7))); |
793 | |
794 | } |
795 | |
796 | |
797 | .toolbar .button { |
798 | - padding: 2.5px; |
799 | - text-shadow: 0 -1 alpha (#000, 0.75); |
800 | - icon-shadow: none; |
801 | + padding: 2.5px; |
802 | + text-shadow: 0 -1 alpha (#000, 0.75); |
803 | + icon-shadow: none; |
804 | + border-radius: 3px; |
805 | + -unico-focus-border-radius: 3; |
806 | +} |
807 | + |
808 | +.toolbar .button:hover { |
809 | + icon-shadow: -1 -1 alpha (@selected_fg_color, 0.2), |
810 | + 1 -1 alpha (@selected_fg_color, 0.2), |
811 | + -1 1 alpha (@selected_fg_color, 0.2), |
812 | + 1 1 alpha (@selected_fg_color, 0.2); |
813 | } |
814 | |
815 | /*************************** |
816 | @@ -231,3 +249,11 @@ |
817 | from (#dd3b27), |
818 | to (#791235)); |
819 | } |
820 | + |
821 | +/* Don't round combobox buttons */ |
822 | + |
823 | +GtkComboBox.combobox-entry .button, |
824 | +GtkComboBoxText.combobox-entry .button { |
825 | + -unico-focus-border-radius: 3; |
826 | + border-radius: 3px; |
827 | +} |
828 | |
829 | === modified file 'gtk-3.0/gtk-widgets.css' |
830 | --- gtk-3.0/gtk-widgets.css 2012-08-04 07:53:52 +0000 |
831 | +++ gtk-3.0/gtk-widgets.css 2012-09-03 20:38:20 +0000 |
832 | @@ -9,9 +9,9 @@ |
833 | -GtkWidget-separator-height: 2; |
834 | |
835 | -unico-focus-border-color: alpha (@selected_bg_color, 0.9); |
836 | - -unico-focus-border-radius: 2; |
837 | - -unico-focus-fill-color: alpha (#FFF, 0.0); |
838 | - -unico-focus-outer-stroke-color: alpha (@selected_bg_color, 0.45); |
839 | + -unico-focus-border-radius: 3; |
840 | + -unico-focus-fill-color: alpha (#FFF, 0.0); |
841 | + -unico-focus-outer-stroke-color: alpha (@selected_bg_color, 0.45); |
842 | |
843 | -GtkWindow-resize-grip-height: 0; |
844 | -GtkWindow-resize-grip-width: 0; |
845 | @@ -218,26 +218,31 @@ |
846 | .view, |
847 | column-header .button { |
848 | border-radius: 0; |
849 | + -unico-focus-border-radius: 0; |
850 | } |
851 | |
852 | /* Slightly rounded */ |
853 | -.button, |
854 | .check, |
855 | .entry, |
856 | .notebook, |
857 | .notebook tab .button, |
858 | -GtkProgressBar, |
859 | +GtkSpinButton.button, |
860 | GtkSwitch, |
861 | GtkSwitch.slider, |
862 | -GtkSwitch.trough { |
863 | - border-radius: 2.5px; |
864 | +GtkSwitch.trough, |
865 | +GtkProgressBar { |
866 | + border-radius: 3px; |
867 | + -unico-focus-border-radius: 3; |
868 | } |
869 | |
870 | /* Round */ |
871 | +.button, |
872 | .help_button, |
873 | .radio, |
874 | -GtkScale.trough { |
875 | +GtkScale.trough, |
876 | +GtkScale.slider { |
877 | border-radius: 12px; |
878 | + -unico-focus-border-radius: 12; |
879 | } |
880 | |
881 | /************* |
882 | @@ -1223,6 +1228,8 @@ |
883 | @import url("sidebar.css"); |
884 | @import url("scale.css"); |
885 | @import url("scrollbar.css"); |
886 | +@import url("spin_button.css"); |
887 | +@import url("switch.css"); |
888 | @import url("toolbar.css"); |
889 | @import url("infobar.css"); |
890 | @import url("panel.css"); |
891 | @@ -1231,6 +1238,7 @@ |
892 | @import url("check_and_radio.css"); |
893 | @import url("unity.css"); |
894 | @import url("unity-greeter.css"); |
895 | +@import url("apps/gcalctool.css"); |
896 | @import url("apps/contacts.css"); |
897 | @import url("apps/gnome-terminal.css"); |
898 | @import url("apps/nautilus.css"); |
899 | |
900 | === modified file 'gtk-3.0/scale.css' |
901 | --- gtk-3.0/scale.css 2012-07-06 04:45:53 +0000 |
902 | +++ gtk-3.0/scale.css 2012-09-03 20:38:20 +0000 |
903 | @@ -3,18 +3,32 @@ |
904 | ************/ |
905 | GtkScale { |
906 | border-width: 1px; |
907 | - -GtkScale-slider-length: 20; |
908 | - -GtkRange-slider-width: 20; |
909 | + -GtkScale-slider-length: 18; |
910 | + -GtkRange-slider-width: 18; |
911 | -GtkRange-trough-border: 1; |
912 | } |
913 | |
914 | GtkScale.slider { |
915 | - background-image: url("assets/scale-slider.svg"); |
916 | + background-image: -gtk-gradient (linear, |
917 | + left top, |
918 | + left bottom, |
919 | + color-stop (0, mix (#ffffff, @bg_color, 0.8)), |
920 | + color-stop (0.5, mix (#ffffff, @bg_color, 0.95)), |
921 | + color-stop (0.55, @bg_color), |
922 | + color-stop (0.8, shade (@bg_color, 0.9)), |
923 | + color-stop (1, shade (@bg_color, 1.1))); |
924 | } |
925 | |
926 | .menubar .menuitem GtkScale.slider:hover, |
927 | GtkScale.slider:hover { |
928 | - background-image: url("assets/scale-slider-hover.svg"); |
929 | + background-image: -gtk-gradient (linear, |
930 | + left top, |
931 | + left bottom, |
932 | + color-stop (0, shade (mix (#ffffff, @bg_color, 0.8), 1.2)), |
933 | + color-stop (0.5, shade (mix (#ffffff, @bg_color, 0.95), 1.2)), |
934 | + color-stop (0.55, shade (@bg_color, 1.2)), |
935 | + color-stop (0.8, shade (shade (@bg_color, 0.9), 1.2)), |
936 | + color-stop (1, shade (shade (@bg_color, 1.1), 1.2))); |
937 | } |
938 | |
939 | GtkScale.scale-has-marks-below.slider.horizontal { |
940 | |
941 | === added file 'gtk-3.0/spin_button.css' |
942 | --- gtk-3.0/spin_button.css 1970-01-01 00:00:00 +0000 |
943 | +++ gtk-3.0/spin_button.css 2012-09-03 20:38:20 +0000 |
944 | @@ -0,0 +1,50 @@ |
945 | +/************** |
946 | +* Spin button * |
947 | +***************/ |
948 | + |
949 | +GtkSpinButton.button, |
950 | +.spinbutton.button, |
951 | +.spinbutton.button:focused { |
952 | + background-image: -gtk-gradient (linear, |
953 | + left top, |
954 | + left bottom, |
955 | + color-stop (0, mix (#ffffff, @bg_color, 0.75)), |
956 | + color-stop (0.5, mix (#ffffff, @bg_color, 0.95)), |
957 | + color-stop (0.55, @bg_color), |
958 | + color-stop (0.8, shade (@bg_color, 0.9)), |
959 | + color-stop (1, shade (@bg_color, 1.1))); |
960 | +} |
961 | + |
962 | +GtkSpinButton.button:hover, |
963 | +.spinbutton.button:hover { |
964 | + background-image: -gtk-gradient (linear, |
965 | + left top, |
966 | + left bottom, |
967 | + color-stop (0, shade (mix (#ffffff, @bg_color, 0.75), 1.2)), |
968 | + color-stop (0.5, shade (mix (#ffffff, @bg_color, 0.95), 1.2)), |
969 | + color-stop (0.55, shade (@bg_color, 1.2)), |
970 | + color-stop (0.8, shade (shade (@bg_color, 0.9), 1.2)), |
971 | + color-stop (1, shade (shade (@bg_color, 1.1), 1.2))); |
972 | +} |
973 | + |
974 | +GtkSpinButton.button:active, |
975 | +GtkSpinButton.button:active:focused, |
976 | +GtkSpinButton.button:hover:active, |
977 | +GtkSpinButton.button:hover:active:focused { |
978 | + background-image: -gtk-gradient (linear, |
979 | + left top, |
980 | + left bottom, |
981 | + color-stop (0, mix (#ffffff, @selected_bg_color, 0.75)), |
982 | + color-stop (0.5, mix (#ffffff, @selected_bg_color, 0.95)), |
983 | + color-stop (0.55, @selected_bg_color), |
984 | + color-stop (0.8, shade (@selected_bg_color, 0.9)), |
985 | + color-stop (1, shade (@selected_bg_color, 1.1))); |
986 | +} |
987 | + |
988 | +.spinbutton.button* { |
989 | + border-radius: 0 0 0 0; |
990 | +} |
991 | + |
992 | +.spinbutton.button:nth-child(last) { |
993 | + border-radius: 0 3px 3px 0; |
994 | +} |
995 | |
996 | === added file 'gtk-3.0/switch.css' |
997 | --- gtk-3.0/switch.css 1970-01-01 00:00:00 +0000 |
998 | +++ gtk-3.0/switch.css 2012-09-03 20:38:20 +0000 |
999 | @@ -0,0 +1,43 @@ |
1000 | +/********* |
1001 | +* Switch * |
1002 | +**********/ |
1003 | + |
1004 | +GtkSwitch { |
1005 | + -unico-focus-border-radius: 3; |
1006 | +} |
1007 | + |
1008 | +GtkSwitch.slider { |
1009 | + background-image: -gtk-gradient (linear, |
1010 | + left top, |
1011 | + left bottom, |
1012 | + color-stop (0, mix (#ffffff, @bg_color, 0.75)), |
1013 | + color-stop (0.5, mix (#ffffff, @bg_color, 0.95)), |
1014 | + color-stop (0.55, @bg_color), |
1015 | + color-stop (0.8, shade (@bg_color, 0.9)), |
1016 | + color-stop (1, shade (@bg_color, 1.1))); |
1017 | +} |
1018 | + |
1019 | +GtkSwitch.slider:hover { |
1020 | + background-image: -gtk-gradient (linear, |
1021 | + left top, |
1022 | + left bottom, |
1023 | + color-stop (0, shade (mix (#ffffff, @bg_color, 0.75), 1.2)), |
1024 | + color-stop (0.5, shade (mix (#ffffff, @bg_color, 0.95), 1.2)), |
1025 | + color-stop (0.55, shade (@bg_color, 1.2)), |
1026 | + color-stop (0.8, shade (shade (@bg_color, 0.9), 1.2)), |
1027 | + color-stop (1, shade (shade (@bg_color, 1.1), 1.2))); |
1028 | +} |
1029 | + |
1030 | +GtkSwitch.slider:active, |
1031 | +GtkSwitch.slider:active:focused, |
1032 | +GtkSwitch.slider:hover:active, |
1033 | +GtkSwitch.slider:hover:active:focused { |
1034 | + background-image: -gtk-gradient (linear, |
1035 | + left top, |
1036 | + left bottom, |
1037 | + color-stop (0, mix (#ffffff, @selected_bg_color, 0.75)), |
1038 | + color-stop (0.5, mix (#ffffff, @selected_bg_color, 0.95)), |
1039 | + color-stop (0.55, @selected_bg_color), |
1040 | + color-stop (0.8, shade (@selected_bg_color, 0.9)), |
1041 | + color-stop (1, shade (@selected_bg_color, 1.1))); |
1042 | +} |
1043 | |
1044 | === modified file 'metacity-1/close.png' |
1045 | Binary files metacity-1/close.png 2012-07-23 05:03:37 +0000 and metacity-1/close.png 2012-09-03 20:38:20 +0000 differ |
1046 | === modified file 'metacity-1/close_focused_prelight.png' |
1047 | Binary files metacity-1/close_focused_prelight.png 2012-07-23 05:03:37 +0000 and metacity-1/close_focused_prelight.png 2012-09-03 20:38:20 +0000 differ |
1048 | === modified file 'metacity-1/close_focused_pressed.png' |
1049 | Binary files metacity-1/close_focused_pressed.png 2012-07-23 05:03:37 +0000 and metacity-1/close_focused_pressed.png 2012-09-03 20:38:20 +0000 differ |
1050 | === modified file 'metacity-1/maximize.png' |
1051 | Binary files metacity-1/maximize.png 2012-06-25 05:36:11 +0000 and metacity-1/maximize.png 2012-09-03 20:38:20 +0000 differ |
1052 | === modified file 'metacity-1/maximize_focused_prelight.png' |
1053 | Binary files metacity-1/maximize_focused_prelight.png 2012-06-25 05:36:11 +0000 and metacity-1/maximize_focused_prelight.png 2012-09-03 20:38:20 +0000 differ |
1054 | === modified file 'metacity-1/maximize_focused_pressed.png' |
1055 | Binary files metacity-1/maximize_focused_pressed.png 2012-06-25 05:36:11 +0000 and metacity-1/maximize_focused_pressed.png 2012-09-03 20:38:20 +0000 differ |
1056 | === modified file 'metacity-1/minimize.png' |
1057 | Binary files metacity-1/minimize.png 2012-06-25 05:36:11 +0000 and metacity-1/minimize.png 2012-09-03 20:38:20 +0000 differ |
1058 | === modified file 'metacity-1/minimize_focused_prelight.png' |
1059 | Binary files metacity-1/minimize_focused_prelight.png 2012-06-25 05:36:11 +0000 and metacity-1/minimize_focused_prelight.png 2012-09-03 20:38:20 +0000 differ |
1060 | === modified file 'metacity-1/minimize_focused_pressed.png' |
1061 | Binary files metacity-1/minimize_focused_pressed.png 2012-06-25 05:36:11 +0000 and metacity-1/minimize_focused_pressed.png 2012-09-03 20:38:20 +0000 differ |
1062 | === modified file 'metacity-1/unmaximize.png' |
1063 | Binary files metacity-1/unmaximize.png 2012-06-25 05:36:11 +0000 and metacity-1/unmaximize.png 2012-09-03 20:38:20 +0000 differ |
1064 | === modified file 'metacity-1/unmaximize_focused_prelight.png' |
1065 | Binary files metacity-1/unmaximize_focused_prelight.png 2012-06-25 05:36:11 +0000 and metacity-1/unmaximize_focused_prelight.png 2012-09-03 20:38:20 +0000 differ |
1066 | === modified file 'metacity-1/unmaximize_focused_pressed.png' |
1067 | Binary files metacity-1/unmaximize_focused_pressed.png 2012-06-25 05:36:11 +0000 and metacity-1/unmaximize_focused_pressed.png 2012-09-03 20:38:20 +0000 differ |
1068 | === modified file 'unity/close.png' |
1069 | Binary files unity/close.png 2012-07-23 05:03:37 +0000 and unity/close.png 2012-09-03 20:38:20 +0000 differ |
1070 | === modified file 'unity/close_focused_prelight.png' |
1071 | Binary files unity/close_focused_prelight.png 2012-07-23 05:03:37 +0000 and unity/close_focused_prelight.png 2012-09-03 20:38:20 +0000 differ |
1072 | === modified file 'unity/close_focused_pressed.png' |
1073 | Binary files unity/close_focused_pressed.png 2012-07-23 05:03:37 +0000 and unity/close_focused_pressed.png 2012-09-03 20:38:20 +0000 differ |
1074 | === modified file 'unity/minimize.png' |
1075 | Binary files unity/minimize.png 2012-06-25 05:19:52 +0000 and unity/minimize.png 2012-09-03 20:38:20 +0000 differ |
1076 | === modified file 'unity/minimize_focused_prelight.png' |
1077 | Binary files unity/minimize_focused_prelight.png 2012-06-25 05:19:52 +0000 and unity/minimize_focused_prelight.png 2012-09-03 20:38:20 +0000 differ |
1078 | === modified file 'unity/minimize_focused_pressed.png' |
1079 | Binary files unity/minimize_focused_pressed.png 2012-06-25 05:19:52 +0000 and unity/minimize_focused_pressed.png 2012-09-03 20:38:20 +0000 differ |
1080 | === modified file 'unity/unmaximize.png' |
1081 | Binary files unity/unmaximize.png 2012-06-25 05:19:52 +0000 and unity/unmaximize.png 2012-09-03 20:38:20 +0000 differ |
1082 | === modified file 'unity/unmaximize_focused_prelight.png' |
1083 | Binary files unity/unmaximize_focused_prelight.png 2012-06-25 05:19:52 +0000 and unity/unmaximize_focused_prelight.png 2012-09-03 20:38:20 +0000 differ |
1084 | === modified file 'unity/unmaximize_focused_pressed.png' |
1085 | Binary files unity/unmaximize_focused_pressed.png 2012-06-25 05:19:52 +0000 and unity/unmaximize_focused_pressed.png 2012-09-03 20:38:20 +0000 differ |
Wait, why disapprove?