Merge lp:~abreu-alexandre/ubuntu-html5-theme/bug-fix-meta-package into lp:ubuntu-html5-theme
- bug-fix-meta-package
- Merge into trunk
Proposed by
Alexandre Abreu
Status: | Merged |
---|---|
Approved by: | Alexandre Abreu |
Approved revision: | 191 |
Merged at revision: | 188 |
Proposed branch: | lp:~abreu-alexandre/ubuntu-html5-theme/bug-fix-meta-package |
Merge into: | lp:ubuntu-html5-theme |
Diff against target: |
923 lines (+279/-176) 11 files modified
0.1/ambiance/css/appTemplate.css (+98/-60) 0.1/ambiance/css/sass/constants.scss (+13/-4) 0.1/ambiance/css/sass/listitems.scss (+11/-5) 0.1/ambiance/css/sass/shapes.scss (+3/-3) 0.1/ambiance/css/sass/sliders.scss (+68/-17) 0.1/ambiance/css/sass/tabs.scss (+3/-3) 0.1/ambiance/css/sass/toolbars.scss (+2/-1) 0.1/ambiance/js/list.js (+5/-5) examples/html5-theme/widgets/ListItems.html (+28/-28) examples/html5-theme/widgets/Sliders.html (+8/-8) examples/html5-theme/widgets/UbuntuShape.html (+40/-42) |
To merge this branch: | bzr merge lp:~abreu-alexandre/ubuntu-html5-theme/bug-fix-meta-package |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu HTML5 Theme Developers | Pending | ||
Review via email: mp+246483@code.launchpad.net |
Commit message
Meta branch that contains those bug fixes (easier to land):
lp:~daker/ubuntu-html5-theme/fix.1243396
lp:~daker/ubuntu-html5-theme/fix.1294779
lp:~daker/ubuntu-html5-theme/fix.1294993
lp:~daker/ubuntu-html5-theme/fix.1294986
lp:~daker/ubuntu-html5-theme/fix.1216874
lp:~daker/ubuntu-html5-theme/fix.slider
Description of the change
Meta branch that contains those bug fixes (easier to land):
lp:~daker/ubuntu-html5-theme/fix.1243396
lp:~daker/ubuntu-html5-theme/fix.1294779
lp:~daker/ubuntu-html5-theme/fix.1294993
lp:~daker/ubuntu-html5-theme/fix.1294986
lp:~daker/ubuntu-html5-theme/fix.1216874
lp:~daker/ubuntu-html5-theme/fix.slider
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 '0.1/ambiance/css/appTemplate.css' |
2 | --- 0.1/ambiance/css/appTemplate.css 2014-05-25 18:51:21 +0000 |
3 | +++ 0.1/ambiance/css/appTemplate.css 2015-01-14 19:02:01 +0000 |
4 | @@ -48,6 +48,9 @@ |
5 | * Font family |
6 | */ |
7 | /* |
8 | + * Slider |
9 | + */ |
10 | +/* |
11 | * Copyright (C) 2013 Adnane Belmadiaf <daker@ubuntu.com> |
12 | * License granted by Canonical Limited |
13 | * |
14 | @@ -221,7 +224,7 @@ |
15 | display: block; |
16 | } |
17 | [data-role="header"] .active { |
18 | - color: #484647; |
19 | + color: #888888; |
20 | padding-left: 15px; |
21 | -webkit-opacity: 1; |
22 | opacity: 1; |
23 | @@ -245,8 +248,8 @@ |
24 | |
25 | [data-role="tabitem"] { |
26 | display: inline-block; |
27 | - font: 35px "Ubuntu"; |
28 | - letter-spacing: -1px; |
29 | + font: 33px "Ubuntu"; |
30 | + font-weight: 100; |
31 | line-height: 60px; |
32 | padding-right: 35px; |
33 | text-decoration: none; |
34 | @@ -442,7 +445,7 @@ |
35 | } |
36 | |
37 | .textfield.clear:focus { |
38 | - background: url(artwork/icon_clear@20.png) no-repeat 97% center white; |
39 | + background: url(artwork/icon_clear@20.png) no-repeat 97% center #fff; |
40 | background-size: 12%; |
41 | } |
42 | |
43 | @@ -555,7 +558,6 @@ |
44 | from { |
45 | -webkit-transform: rotate(1deg); |
46 | } |
47 | - |
48 | to { |
49 | -webkit-transform: rotate(360deg); |
50 | } |
51 | @@ -564,11 +566,9 @@ |
52 | 0% { |
53 | opacity: 0; |
54 | } |
55 | - |
56 | 50% { |
57 | opacity: 1; |
58 | } |
59 | - |
60 | 100% { |
61 | opacity: 0; |
62 | } |
63 | @@ -698,43 +698,33 @@ |
64 | 0% { |
65 | -webkit-transform: translate3d(0, 0, 0); |
66 | } |
67 | - |
68 | 10% { |
69 | -webkit-transform: translate3d(-20px, 0, 0); |
70 | } |
71 | - |
72 | 20% { |
73 | -webkit-transform: translate3d(20px, 0, 0); |
74 | } |
75 | - |
76 | 30% { |
77 | -webkit-transform: translate3d(-20px, 0, 0); |
78 | } |
79 | - |
80 | 40% { |
81 | -webkit-transform: translate3d(20px, 0, 0); |
82 | } |
83 | - |
84 | 50% { |
85 | -webkit-transform: translate3d(-20px, 0, 0); |
86 | } |
87 | - |
88 | 60% { |
89 | -webkit-transform: translate3d(20px, 0, 0); |
90 | } |
91 | - |
92 | 70% { |
93 | -webkit-transform: translate3d(-20px, 0, 0); |
94 | } |
95 | - |
96 | 80% { |
97 | -webkit-transform: translate3d(20px, 0, 0); |
98 | } |
99 | - |
100 | 90% { |
101 | -webkit-transform: translate3d(-20px, 0, 0); |
102 | } |
103 | - |
104 | 100% { |
105 | -webkit-transform: translate3d(0, 0, 0); |
106 | } |
107 | @@ -743,43 +733,33 @@ |
108 | 0% { |
109 | -webkit-transform: translate3d(0, 0, 0); |
110 | } |
111 | - |
112 | 10% { |
113 | -webkit-transform: translate3d(-20px, 0, 0); |
114 | } |
115 | - |
116 | 20% { |
117 | -webkit-transform: translate3d(20px, 0, 0); |
118 | } |
119 | - |
120 | 30% { |
121 | -webkit-transform: translate3d(-20px, 0, 0); |
122 | } |
123 | - |
124 | 40% { |
125 | -webkit-transform: translate3d(20px, 0, 0); |
126 | } |
127 | - |
128 | 50% { |
129 | -webkit-transform: translate3d(-20px, 0, 0); |
130 | } |
131 | - |
132 | 60% { |
133 | -webkit-transform: translate3d(20px, 0, 0); |
134 | } |
135 | - |
136 | 70% { |
137 | -webkit-transform: translate3d(-20px, 0, 0); |
138 | } |
139 | - |
140 | 80% { |
141 | -webkit-transform: translate3d(20px, 0, 0); |
142 | } |
143 | - |
144 | 90% { |
145 | -webkit-transform: translate3d(-20px, 0, 0); |
146 | } |
147 | - |
148 | 100% { |
149 | -webkit-transform: translate3d(0, 0, 0); |
150 | } |
151 | @@ -826,7 +806,7 @@ |
152 | background: #dd4814; |
153 | border: 2px solid #dd4814; |
154 | border-radius: 6px; |
155 | - color: white; |
156 | + color: #ffffff; |
157 | font-family: "Ubuntu"; |
158 | font-size: 1rem; |
159 | padding: 9px 25px; |
160 | @@ -836,21 +816,21 @@ |
161 | } |
162 | [data-role="button"].positive { |
163 | background: #38b44a; |
164 | - color: white; |
165 | + color: #ffffff; |
166 | border-color: #38b44a; |
167 | } |
168 | [data-role="button"].information { |
169 | background: #2ab7ec; |
170 | - color: white; |
171 | + color: #ffffff; |
172 | border-color: #2ab7ec; |
173 | } |
174 | [data-role="button"].secondary { |
175 | - background: white; |
176 | + background: #ffffff; |
177 | color: #888888; |
178 | } |
179 | [data-role="button"].negative { |
180 | background: #b2b2b2; |
181 | - color: white; |
182 | + color: #ffffff; |
183 | border-color: #b2b2b2; |
184 | } |
185 | |
186 | @@ -878,31 +858,81 @@ |
187 | /* ---------------------------------- |
188 | * Sliders |
189 | * ---------------------------------- */ |
190 | -/** |
191 | - TODO: remove absolte values for w/h |
192 | - */ |
193 | input[type=range] { |
194 | -webkit-box-sizing: border-box; |
195 | box-sizing: border-box; |
196 | - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); |
197 | - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); |
198 | - -webkit-appearance: none; |
199 | - background-color: rgba(192, 192, 192, 0.1); |
200 | - width: 200px; |
201 | - height: 35px; |
202 | - border-radius: 6px; |
203 | - padding: 5px 0; |
204 | + -webkit-appearance: none; |
205 | + background: linear-gradient(to right, rgba(175, 175, 175, 0.3) 0%, rgba(175, 175, 175, 0.3) 100%); |
206 | + background-position: center; |
207 | + background-size: 99% 4px; |
208 | + background-repeat: no-repeat; |
209 | + -webkit-appearance: none; |
210 | + width: auto; |
211 | + height: 36px; |
212 | + border-radius: 1px; |
213 | + overflow: hidden; |
214 | + margin-top: 5px; |
215 | + margin-bottom: 5px; |
216 | + /*&::-moz-range-thumb:before { |
217 | + position: absolute; |
218 | + top: ($range-slider-height / 2) - ($range-track-height / 2); |
219 | + left: -2000px; |
220 | + width: 2000px; |
221 | + height: $range-track-height; |
222 | + background: $ubuntu_orange; |
223 | + content: ' '; |
224 | + }*/ |
225 | } |
226 | input[type=range]::-webkit-slider-thumb { |
227 | - -webkit-box-shadow: inset 0 2px 1px rgba(0, 0, 0, 0.1); |
228 | - box-shadow: inset 0 2px 1px rgba(0, 0, 0, 0.1); |
229 | + -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.2); |
230 | + box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.2); |
231 | -webkit-box-sizing: border-box; |
232 | box-sizing: border-box; |
233 | -webkit-appearance: none; |
234 | - background-color: #dd4814; |
235 | - border-radius: 6px; |
236 | - width: 30px; |
237 | - height: 27px; |
238 | + background-color: #fff; |
239 | + pointer-events: none; |
240 | + border-radius: 3px; |
241 | + width: 16px; |
242 | + height: 16px; |
243 | + position: relative; |
244 | +} |
245 | +input[type=range]::-webkit-slider-thumb:before { |
246 | + /* what creates the colorful line on the left side of the slider */ |
247 | + position: absolute; |
248 | + top: 6px; |
249 | + left: -2000px; |
250 | + width: 2000px; |
251 | + height: 4px; |
252 | + background: #dd4814; |
253 | + content: ' '; |
254 | +} |
255 | +input[type=range]::-moz-range-track { |
256 | + -webkit-box-sizing: border-box; |
257 | + box-sizing: border-box; |
258 | + background: -moz-linear-gradient(to right, rgba(175, 175, 175, 0.3) 0%, rgba(175, 175, 175, 0.3) 100%); |
259 | + background-position: center; |
260 | + background-size: 99% 4px; |
261 | + background-repeat: no-repeat; |
262 | + width: auto; |
263 | + height: 36px; |
264 | + border: 0; |
265 | + border-radius: 1px; |
266 | + overflow: hidden; |
267 | + margin-top: 5px; |
268 | + margin-bottom: 5px; |
269 | +} |
270 | +input[type=range]::-moz-range-thumb { |
271 | + -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.2); |
272 | + box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.2); |
273 | + -webkit-box-sizing: border-box; |
274 | + box-sizing: border-box; |
275 | + background: #fff; |
276 | + pointer-events: none; |
277 | + border: 0; |
278 | + border-radius: 3px; |
279 | + width: 16px; |
280 | + height: 16px; |
281 | + position: relative; |
282 | } |
283 | |
284 | /* |
285 | @@ -1199,7 +1229,7 @@ |
286 | -webkit-box-sizing: border-box; |
287 | box-sizing: border-box; |
288 | width: 100%; |
289 | - height: 3.5rem; |
290 | + height: 3.1rem; |
291 | border-bottom: solid 0.1rem #c7c7c7; |
292 | color: #787878; |
293 | position: relative; |
294 | @@ -1208,10 +1238,10 @@ |
295 | text-decoration: none; |
296 | color: #787878; |
297 | display: block; |
298 | - height: 3.4rem; |
299 | + height: 3rem; |
300 | position: relative; |
301 | border: none; |
302 | - line-height: 3.4rem; |
303 | + line-height: 3rem; |
304 | padding-left: 1rem; |
305 | padding-right: 1.5rem; |
306 | border-top: 1px solid #ebebeb; |
307 | @@ -1229,7 +1259,7 @@ |
308 | height: 2rem; |
309 | top: 50%; |
310 | right: 0; |
311 | - margin-top: -1rem; |
312 | + margin-top: -1.2rem; |
313 | z-index: 0; |
314 | } |
315 | [data-role="list"] ul li > a:active { |
316 | @@ -1249,7 +1279,12 @@ |
317 | line-height: 1rem; |
318 | } |
319 | [data-role="list"] ul li p:only-child, [data-role="list"] ul li p:first-of-type:last-of-type { |
320 | - line-height: 2.5rem; |
321 | + line-height: 2.1rem; |
322 | +} |
323 | +[data-role="list"] ul li p + p { |
324 | + color: rgba(136, 136, 136, 0.8); |
325 | + padding-top: 0.1rem; |
326 | + font-size: 0.8rem; |
327 | } |
328 | [data-role="list"] ul li > label { |
329 | z-index: 100; |
330 | @@ -1336,6 +1371,7 @@ |
331 | } |
332 | [data-role="footer"] nav ul { |
333 | list-style: none; |
334 | + text-align: right; |
335 | } |
336 | [data-role="footer"] nav ul li, |
337 | [data-role="footer"] nav ul li a { |
338 | @@ -1343,7 +1379,7 @@ |
339 | font-size: 0.6rem; |
340 | text-align: center; |
341 | width: 60px; |
342 | - float: right; |
343 | + display: inline-block; |
344 | text-decoration: none; |
345 | } |
346 | [data-role="footer"] nav ul li { |
347 | @@ -1394,7 +1430,7 @@ |
348 | z-index: 100; |
349 | } |
350 | [data-role="shape"]:after { |
351 | - background: url(../img/ubuntushape_medium_radius_idle@18.png) no-repeat; |
352 | + background: url(../img/ubuntushape.png) no-repeat; |
353 | background-size: 100% 100%; |
354 | content: ' '; |
355 | width: 100%; |
356 | @@ -1406,14 +1442,14 @@ |
357 | [data-role="shape"] img { |
358 | height: 100%; |
359 | width: 100%; |
360 | - border-radius: 1.5rem; |
361 | + max-width: 100% !important; |
362 | margin-bottom: 0; |
363 | display: inline-block; |
364 | } |
365 | [data-role="shape"] div { |
366 | height: 100%; |
367 | width: 100%; |
368 | - border-radius: 1.5rem; |
369 | + border-radius: 1rem; |
370 | margin-bottom: 0; |
371 | display: inline-block; |
372 | } |
373 | @@ -1496,8 +1532,8 @@ |
374 | * <http://www.gnu.org/licenses/>. |
375 | */ |
376 | [data-role="option-selector"] { |
377 | - -webkit-box-shadow: inset 0 2px 2px 0 #d5d5d5; |
378 | - box-shadow: inset 0 2px 2px 0 #d5d5d5; |
379 | + -webkit-box-shadow: inset 0 2px 2px 0 #D5D5D5; |
380 | + box-shadow: inset 0 2px 2px 0 #D5D5D5; |
381 | width: 100%; |
382 | height: auto; |
383 | margin: 0 auto; |
384 | @@ -1689,3 +1725,5 @@ |
385 | font-size: 8px; |
386 | line-height: 1.3; |
387 | } |
388 | + |
389 | +/*# sourceMappingURL=appTemplate.css.map */ |
390 | |
391 | === modified file '0.1/ambiance/css/sass/constants.scss' |
392 | --- 0.1/ambiance/css/sass/constants.scss 2014-02-24 22:24:41 +0000 |
393 | +++ 0.1/ambiance/css/sass/constants.scss 2015-01-14 19:02:01 +0000 |
394 | @@ -20,9 +20,9 @@ |
395 | * <http://www.gnu.org/licenses/> |
396 | */ |
397 | |
398 | - /* |
399 | - * Colours |
400 | - */ |
401 | +/* |
402 | + * Colours |
403 | + */ |
404 | $ubuntu_orange: #dd4814; |
405 | $text_color: #787878; |
406 | $cream: #f3f3e7; |
407 | @@ -36,4 +36,13 @@ |
408 | * Font family |
409 | */ |
410 | |
411 | -$font_family: "Ubuntu"; |
412 | \ No newline at end of file |
413 | +$font_family: "Ubuntu"; |
414 | + |
415 | +/* |
416 | + * Slider |
417 | + */ |
418 | + |
419 | +$range-track-height: 4px !default; |
420 | +$range-slider-width: 16px !default; |
421 | +$range-slider-height: 16px !default; |
422 | +$range-slider-border-radius: 1px !default; |
423 | |
424 | === modified file '0.1/ambiance/css/sass/listitems.scss' |
425 | --- 0.1/ambiance/css/sass/listitems.scss 2014-02-24 17:08:30 +0000 |
426 | +++ 0.1/ambiance/css/sass/listitems.scss 2015-01-14 19:02:01 +0000 |
427 | @@ -42,7 +42,7 @@ |
428 | li { |
429 | @include box_sizing (border-box); |
430 | width: 100%; |
431 | - height: 3.5rem; |
432 | + height: 3.1rem; |
433 | border-bottom: solid 0.1rem #c7c7c7; |
434 | color: $text_color; |
435 | position: relative; |
436 | @@ -51,10 +51,10 @@ |
437 | text-decoration: none; |
438 | color: $text_color; |
439 | display: block; |
440 | - height: 3.4rem; |
441 | + height: 3rem; |
442 | position: relative; |
443 | border: none; |
444 | - line-height: 3.4rem; |
445 | + line-height: 3rem; |
446 | padding-left: 1rem; |
447 | padding-right: 1.5rem; |
448 | border-top: 1px solid #ebebeb; |
449 | @@ -72,7 +72,7 @@ |
450 | height: 2rem; |
451 | top: 50%; |
452 | right: 0; |
453 | - margin-top: -1rem; |
454 | + margin-top: -1.2rem; |
455 | z-index: 0; |
456 | } |
457 | |
458 | @@ -96,7 +96,13 @@ |
459 | |
460 | &:only-child, |
461 | &:first-of-type:last-of-type { |
462 | - line-height: 2.5rem; |
463 | + line-height: 2.1rem; |
464 | + } |
465 | + |
466 | + & + p { |
467 | + color: rgba(136, 136, 136, 0.8); |
468 | + padding-top: 0.1rem; |
469 | + font-size: 0.8rem |
470 | } |
471 | } |
472 | |
473 | |
474 | === modified file '0.1/ambiance/css/sass/shapes.scss' |
475 | --- 0.1/ambiance/css/sass/shapes.scss 2014-02-17 16:25:38 +0000 |
476 | +++ 0.1/ambiance/css/sass/shapes.scss 2015-01-14 19:02:01 +0000 |
477 | @@ -34,7 +34,7 @@ |
478 | z-index: 100; |
479 | |
480 | &:after { |
481 | - background: url(../img/ubuntushape_medium_radius_idle@18.png) no-repeat; |
482 | + background: url(../img/ubuntushape.png) no-repeat; |
483 | background-size: 100% 100%; |
484 | content: ' '; |
485 | width: 100%; |
486 | @@ -47,7 +47,7 @@ |
487 | img { |
488 | height: 100%; |
489 | width: 100%; |
490 | - border-radius: 1.5rem; |
491 | + max-width: 100%!important; |
492 | margin-bottom: 0; |
493 | display: inline-block; |
494 | } |
495 | @@ -55,7 +55,7 @@ |
496 | div { |
497 | height: 100%; |
498 | width: 100%; |
499 | - border-radius: 1.5rem; |
500 | + border-radius: 1rem; |
501 | margin-bottom: 0; |
502 | display: inline-block; |
503 | } |
504 | |
505 | === modified file '0.1/ambiance/css/sass/sliders.scss' |
506 | --- 0.1/ambiance/css/sass/sliders.scss 2014-02-17 16:25:38 +0000 |
507 | +++ 0.1/ambiance/css/sass/sliders.scss 2015-01-14 19:02:01 +0000 |
508 | @@ -24,27 +24,78 @@ |
509 | * Sliders |
510 | * ---------------------------------- */ |
511 | |
512 | -/** |
513 | - TODO: remove absolte values for w/h |
514 | - */ |
515 | - |
516 | input[type=range] { |
517 | @include box_sizing (border-box); |
518 | - @include box_shadow (inset 0 1px 1px rgba(0, 0, 0, 0.1)); |
519 | - -webkit-appearance: none; |
520 | - background-color: rgba(192, 192, 192, 0.1); |
521 | - width: 200px; |
522 | - height: 35px; |
523 | - border-radius: 6px; |
524 | - padding: 5px 0; |
525 | + -webkit-appearance: none; |
526 | + background: linear-gradient(to right, rgba(175, 175, 175, 0.30) 0%, rgba(175, 175, 175, 0.30) 100%); |
527 | + background-position: center; |
528 | + background-size: 99% 4px; |
529 | + background-repeat: no-repeat; |
530 | + -webkit-appearance: none; |
531 | + width: auto; |
532 | + height: $range-slider-height + 20; |
533 | + border-radius: $range-slider-border-radius; |
534 | + overflow: hidden; |
535 | + margin-top: 5px; |
536 | + margin-bottom: 5px; |
537 | |
538 | &::-webkit-slider-thumb { |
539 | - @include box_shadow (inset 0 2px 1px rgba(0, 0, 0, 0.1)); |
540 | + @include box_shadow (inset 0 1px 0 rgba(0, 0, 0, 0.2)); |
541 | @include box_sizing (border-box); |
542 | -webkit-appearance: none; |
543 | - background-color: $ubuntu_orange; |
544 | - border-radius: 6px; |
545 | - width: 30px; |
546 | - height: 27px; |
547 | - } |
548 | + background-color: #fff; |
549 | + pointer-events: none; |
550 | + border-radius: 3px; |
551 | + width: $range-slider-width; |
552 | + height: $range-slider-height; |
553 | + position: relative; |
554 | + } |
555 | + |
556 | + &::-webkit-slider-thumb:before { |
557 | + /* what creates the colorful line on the left side of the slider */ |
558 | + position: absolute; |
559 | + top: ($range-slider-height / 2) - ($range-track-height / 2); |
560 | + left: -2000px; |
561 | + width: 2000px; |
562 | + height: $range-track-height; |
563 | + background: $ubuntu_orange; |
564 | + content: ' '; |
565 | + } |
566 | + |
567 | + &::-moz-range-track { |
568 | + @include box_sizing (border-box); |
569 | + background: -moz-linear-gradient(to right, rgba(175, 175, 175, 0.30) 0%, rgba(175, 175, 175, 0.30) 100%); |
570 | + background-position: center; |
571 | + background-size: 99% 4px; |
572 | + background-repeat: no-repeat; |
573 | + width: auto; |
574 | + height: $range-slider-height + 20; |
575 | + border: 0; |
576 | + border-radius: $range-slider-border-radius; |
577 | + overflow: hidden; |
578 | + margin-top: 5px; |
579 | + margin-bottom: 5px; |
580 | + } |
581 | + |
582 | + &::-moz-range-thumb { |
583 | + @include box_shadow (inset 0 1px 0 rgba(0, 0, 0, 0.2)); |
584 | + @include box_sizing (border-box); |
585 | + background: #fff; |
586 | + pointer-events: none; |
587 | + border: 0; |
588 | + border-radius: 3px; |
589 | + width: $range-slider-width; |
590 | + height: $range-slider-height; |
591 | + position: relative; |
592 | + } |
593 | + |
594 | + /*&::-moz-range-thumb:before { |
595 | + position: absolute; |
596 | + top: ($range-slider-height / 2) - ($range-track-height / 2); |
597 | + left: -2000px; |
598 | + width: 2000px; |
599 | + height: $range-track-height; |
600 | + background: $ubuntu_orange; |
601 | + content: ' '; |
602 | + }*/ |
603 | } |
604 | |
605 | === modified file '0.1/ambiance/css/sass/tabs.scss' |
606 | --- 0.1/ambiance/css/sass/tabs.scss 2014-02-28 22:05:37 +0000 |
607 | +++ 0.1/ambiance/css/sass/tabs.scss 2015-01-14 19:02:01 +0000 |
608 | @@ -41,7 +41,7 @@ |
609 | } |
610 | |
611 | .active { |
612 | - color: #484647; |
613 | + color: #888888; |
614 | padding-left: 15px; |
615 | -webkit-opacity: 1; |
616 | opacity: 1; |
617 | @@ -68,8 +68,8 @@ |
618 | |
619 | [data-role="tabitem"] { |
620 | display: inline-block; |
621 | - font: 35px $font_family; |
622 | - letter-spacing: -1px; |
623 | + font: 33px $font_family; |
624 | + font-weight: 100; |
625 | line-height: 60px; |
626 | padding-right: 35px; |
627 | text-decoration: none; |
628 | |
629 | === modified file '0.1/ambiance/css/sass/toolbars.scss' |
630 | --- 0.1/ambiance/css/sass/toolbars.scss 2014-02-20 20:37:13 +0000 |
631 | +++ 0.1/ambiance/css/sass/toolbars.scss 2015-01-14 19:02:01 +0000 |
632 | @@ -49,6 +49,7 @@ |
633 | |
634 | ul { |
635 | list-style: none; |
636 | + text-align: right; |
637 | |
638 | li, |
639 | li a { |
640 | @@ -56,7 +57,7 @@ |
641 | font-size: 0.6rem; |
642 | text-align: center; |
643 | width: 60px; |
644 | - float: right; |
645 | + display: inline-block; |
646 | text-decoration: none; |
647 | } |
648 | li { |
649 | |
650 | === added file '0.1/ambiance/img/ubuntushape.png' |
651 | Binary files 0.1/ambiance/img/ubuntushape.png 1970-01-01 00:00:00 +0000 and 0.1/ambiance/img/ubuntushape.png 2015-01-14 19:02:01 +0000 differ |
652 | === modified file '0.1/ambiance/js/list.js' |
653 | --- 0.1/ambiance/js/list.js 2014-02-28 20:29:07 +0000 |
654 | +++ 0.1/ambiance/js/list.js 2015-01-14 19:02:01 +0000 |
655 | @@ -78,7 +78,7 @@ |
656 | * Add or Set the List Header |
657 | * @method setHeader |
658 | * @param {String} text - The header text |
659 | - */ |
660 | + */ |
661 | setHeader: function (text) { |
662 | if (typeof (text) == 'string') { |
663 | var header = this._list.querySelectorAll('header'); |
664 | @@ -96,7 +96,7 @@ |
665 | if (!header) |
666 | header = document.createElement('header'); |
667 | |
668 | - header.innerText = text; |
669 | + header.textContent = text; |
670 | } |
671 | }, |
672 | /** |
673 | @@ -122,12 +122,12 @@ |
674 | }); |
675 | } |
676 | //FIXME: no real checks on text content |
677 | - a.innerText = text; |
678 | + a.textContent = text; |
679 | li.appendChild(a); |
680 | |
681 | if (label && typeof (label) == 'string') { |
682 | var n = document.createElement('label'); |
683 | - n.innerText = label; |
684 | + n.textContent = label; |
685 | li.appendChild(n); |
686 | } |
687 | |
688 | @@ -143,7 +143,7 @@ |
689 | * Gets a list item <li> by its index, where index counting starts from 1 |
690 | * @method at |
691 | * @param {Number} index |
692 | - * @return The list item, or null on failure |
693 | + * @return The list item, or null on failure |
694 | */ |
695 | at: function (index) { |
696 | if (typeof (index) != 'number') |
697 | |
698 | === modified file 'examples/html5-theme/widgets/ListItems.html' |
699 | --- examples/html5-theme/widgets/ListItems.html 2014-02-12 19:46:04 +0000 |
700 | +++ examples/html5-theme/widgets/ListItems.html 2015-01-14 19:02:01 +0000 |
701 | @@ -5,18 +5,18 @@ |
702 | This file is part of ubuntu-html5-ui-toolkit. |
703 | |
704 | This package is free software; you can redistribute it and/or modify |
705 | - it under the terms of the GNU Lesser General Public License as |
706 | - published by the Free Software Foundation; either version 3 of the |
707 | + it under the terms of the GNU Lesser General Public License as |
708 | + published by the Free Software Foundation; either version 3 of the |
709 | License, or |
710 | (at your option) any later version. |
711 | - |
712 | + |
713 | This package is distributed in the hope that it will be useful, |
714 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
715 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
716 | GNU General Public License for more details. |
717 | - |
718 | - You should have received a copy of the GNU Lesser General Public |
719 | - License along with this program. If not, see |
720 | + |
721 | + You should have received a copy of the GNU Lesser General Public |
722 | + License along with this program. If not, see |
723 | <http://www.gnu.org/licenses/>. |
724 | --> |
725 | |
726 | @@ -54,15 +54,15 @@ |
727 | <ul data-role="listview"> |
728 | <li> |
729 | <p>Label</p> |
730 | - <p class="small-font">Secondary Label</p> |
731 | - </li> |
732 | - <li> |
733 | - <p>Label</p> |
734 | - <p class="small-font">Secondary Label</p> |
735 | - </li> |
736 | - <li> |
737 | - <p>Label</p> |
738 | - <p class="small-font">Secondary Label</p> |
739 | + <p>Secondary Label</p> |
740 | + </li> |
741 | + <li> |
742 | + <p>Label</p> |
743 | + <p>Secondary Label</p> |
744 | + </li> |
745 | + <li> |
746 | + <p>Label</p> |
747 | + <p>Secondary Label</p> |
748 | </li> |
749 | </ul> |
750 | </section> |
751 | @@ -72,19 +72,19 @@ |
752 | <ul data-role="listview"> |
753 | <li> |
754 | <p>Label</p> |
755 | - <p class="small-font">Value 1, Value 2</p> |
756 | - </li> |
757 | - <li> |
758 | - <p>Label</p> |
759 | - <p class="small-font">Value 1, Value 2</p> |
760 | - </li> |
761 | - <li> |
762 | - <p>Label</p> |
763 | - <p class="small-font">Value 1, Value 2</p> |
764 | - </li> |
765 | - <li> |
766 | - <p>Label</p> |
767 | - <p class="small-font">Value 1, Value 2</p> |
768 | + <p>Value 1, Value 2</p> |
769 | + </li> |
770 | + <li> |
771 | + <p>Label</p> |
772 | + <p>Value 1, Value 2</p> |
773 | + </li> |
774 | + <li> |
775 | + <p>Label</p> |
776 | + <p>Value 1, Value 2</p> |
777 | + </li> |
778 | + <li> |
779 | + <p>Label</p> |
780 | + <p>Value 1, Value 2</p> |
781 | </li> |
782 | </ul> |
783 | </section> |
784 | |
785 | === modified file 'examples/html5-theme/widgets/Sliders.html' |
786 | --- examples/html5-theme/widgets/Sliders.html 2014-02-12 19:46:04 +0000 |
787 | +++ examples/html5-theme/widgets/Sliders.html 2015-01-14 19:02:01 +0000 |
788 | @@ -5,18 +5,18 @@ |
789 | This file is part of ubuntu-html5-ui-toolkit. |
790 | |
791 | This package is free software; you can redistribute it and/or modify |
792 | - it under the terms of the GNU Lesser General Public License as |
793 | - published by the Free Software Foundation; either version 3 of the |
794 | + it under the terms of the GNU Lesser General Public License as |
795 | + published by the Free Software Foundation; either version 3 of the |
796 | License, or |
797 | (at your option) any later version. |
798 | - |
799 | + |
800 | This package is distributed in the hope that it will be useful, |
801 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
802 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
803 | GNU General Public License for more details. |
804 | - |
805 | - You should have received a copy of the GNU Lesser General Public |
806 | - License along with this program. If not, see |
807 | + |
808 | + You should have received a copy of the GNU Lesser General Public |
809 | + License along with this program. If not, see |
810 | <http://www.gnu.org/licenses/>. |
811 | --> |
812 | |
813 | @@ -36,14 +36,14 @@ |
814 | <div data-role="content"> |
815 | |
816 | <div class="inset"> |
817 | - <form onsubmit="return false" oninput="ojim.value = jim.valueAsNumber"> |
818 | + <form onsubmit="return false" oninput="ojim.value = jim.valueAsNumber;"> |
819 | <input name="jim" id="jim" type="range" min="0" max="100" value="0"> |
820 | <output for="jim" name="ojim">0</output> |
821 | </form> |
822 | </div> |
823 | |
824 | <div class="inset"> |
825 | - <form onsubmit="return false" oninput="obob.value = bob.valueAsNumber"> |
826 | + <form onsubmit="return false" oninput="obob.value = bob.valueAsNumber;"> |
827 | <input id="bob" name="bob" type="range" min="23" max="109" value="0"> |
828 | <output for="bob" name="obob">23</output> |
829 | </form> |
830 | |
831 | === modified file 'examples/html5-theme/widgets/UbuntuShape.html' |
832 | --- examples/html5-theme/widgets/UbuntuShape.html 2014-02-13 19:54:08 +0000 |
833 | +++ examples/html5-theme/widgets/UbuntuShape.html 2015-01-14 19:02:01 +0000 |
834 | @@ -33,48 +33,46 @@ |
835 | <body> |
836 | <div data-role="mainview"> |
837 | |
838 | - <div class="large-font" style="padding-bottom: 40px"> |
839 | - Ubuntu Shape |
840 | - </div> |
841 | - |
842 | - <div class="medium-font"> |
843 | - <span>Color</span> |
844 | - <div data-role="content" style="display: inline"> |
845 | - <div data-role="shape"> |
846 | - <div style="background-color: #dd4814"/> |
847 | - </div> |
848 | - </div> |
849 | - <div data-role="content" style="display: inline"> |
850 | - <div data-role="shape"> |
851 | - <div style="background-color: violet"/> |
852 | - </div> |
853 | - </div> |
854 | - <div data-role="content" style="display: inline"> |
855 | - <div data-role="shape"> |
856 | - <div style="background-color: gray"/> |
857 | - </div> |
858 | - </div> |
859 | - </div> |
860 | - |
861 | - <div class="medium-font"> |
862 | - <span>Image</span> |
863 | - <div data-role="content" style="display: inline"> |
864 | - <div data-role="shape"> |
865 | - <img src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/img/map_icon.png"> |
866 | - </div> |
867 | - </div> |
868 | - </div> |
869 | - |
870 | - |
871 | - <div class="medium-font"> |
872 | - <span>Radius</span> |
873 | - <div data-role="content" style="display: inline"> |
874 | - <div data-role="shape"> |
875 | - <div style="display: table;"> <span style="display: table-cell; vertical-align: middle; text-align: center" class="small-font">small</span></div> |
876 | - </div> |
877 | - </div> |
878 | - </div> |
879 | + <div class="large-font" style="padding-bottom: 40px">Ubuntu Shape</div> |
880 | + |
881 | + <div class="medium-font"> |
882 | + <span>Color</span> |
883 | + <div data-role="content" style="display: inline"> |
884 | + <div data-role="shape"> |
885 | + <div style="background-color: #dd4814"/> |
886 | + </div> |
887 | + </div> |
888 | + <div data-role="content" style="display: inline"> |
889 | + <div data-role="shape"> |
890 | + <div style="background-color: violet"/> |
891 | + </div> |
892 | + </div> |
893 | + <div data-role="content" style="display: inline"> |
894 | + <div data-role="shape"> |
895 | + <div style="background-color: gray"/> |
896 | + </div> |
897 | + </div> |
898 | + </div> |
899 | + |
900 | + <div class="medium-font"> |
901 | + <span>Image</span> |
902 | + <div data-role="content" style="display: inline"> |
903 | + <div data-role="shape"> |
904 | + <img src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/img/map_icon.png"></div> |
905 | + </div> |
906 | + </div> |
907 | + |
908 | + <div class="medium-font"> |
909 | + <span>Radius</span> |
910 | + <div data-role="content" style="display: inline"> |
911 | + <div data-role="shape"> |
912 | + <div style="display: table;"> |
913 | + <span style="display: table-cell; vertical-align: middle; text-align: center" class="small-font">small</span> |
914 | + </div> |
915 | + </div> |
916 | + </div> |
917 | + </div> |
918 | |
919 | </div> |
920 | </body> |
921 | -</html> |
922 | +</html> |
923 | \ No newline at end of file |