Merge lp:~daker/ubuntu-html5-theme/fix.progressbar into lp:~ubuntu-html5-theme-devs/ubuntu-html5-theme/ambiance

Proposed by Adnane Belmadiaf
Status: Merged
Approved by: Alexandre Abreu
Approved revision: 86
Merged at revision: 93
Proposed branch: lp:~daker/ubuntu-html5-theme/fix.progressbar
Merge into: lp:~ubuntu-html5-theme-devs/ubuntu-html5-theme/ambiance
Diff against target: 146 lines (+36/-31)
2 files modified
0.1/ambiance/css/progress-bars.css (+27/-24)
0.1/examples/widgets/ProgressBars.html (+9/-7)
To merge this branch: bzr merge lp:~daker/ubuntu-html5-theme/fix.progressbar
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Alexandre Abreu Approve
Review via email: mp+188205@code.launchpad.net

Commit message

Updated the progressbar component to match the design

To post a comment you must log in.
Revision history for this message
Alexandre Abreu (abreu-alexandre) :
review: Approve
Revision history for this message
Alexandre Abreu (abreu-alexandre) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '0.1/ambiance/css/progress-bars.css'
2--- 0.1/ambiance/css/progress-bars.css 2013-07-17 15:27:43 +0000
3+++ 0.1/ambiance/css/progress-bars.css 2013-09-28 20:21:05 +0000
4@@ -5,18 +5,18 @@
5 * This file is part of ubuntu-html5-theme.
6 *
7 * This package is free software; you can redistribute it and/or modify
8- * it under the terms of the GNU Lesser General Public License as
9- * published by the Free Software Foundation; either version 3 of the
10+ * it under the terms of the GNU Lesser General Public License as
11+ * published by the Free Software Foundation; either version 3 of the
12 * License, or
13 * (at your option) any later version.
14-
15+
16 * This package is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 * GNU General Public License for more details.
20-
21- * You should have received a copy of the GNU Lesser General Public
22- * License along with this program. If not, see
23+
24+ * You should have received a copy of the GNU Lesser General Public
25+ * License along with this program. If not, see
26 * <http://www.gnu.org/licenses/>.
27 */
28
29@@ -27,7 +27,7 @@
30 /* Spinner */
31 progress {
32 -webkit-appearance: none;
33- height: 10px;
34+ height: 35px;
35 }
36
37 progress:not([value]) {
38@@ -51,34 +51,37 @@
39 progress:not([value])::-webkit-progress-bar {
40 background: none;
41 -webkit-box-shadow: none;
42-
43 }
44
45 /* Progress bar */
46 progress[value]::-webkit-progress-value {
47 width: 100%;
48- background: #027ce0;
49+ background: #dd4814;
50 border: none;
51+ border-radius: 6px;
52 display: block;
53+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1);
54+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1);
55 }
56
57 progress[value]::-webkit-progress-bar {
58- background: #fff;
59 padding: 1px;
60- -webkit-box-shadow: inset 0px 1px 5px rgba(0, 0, 0, 0.3);
61- -webkit-border-radius: 3px;
62- box-shadow: inset 0px 1px 5px rgba(0, 0, 0, 0.3);
63- border-radius: 3px;
64+ background-color: rgba(192, 192, 192, 0.1);
65+ width: 200px;
66+ height: 35px;
67+ -webkit-box-sizing: border-box;
68+ box-sizing: border-box;
69+ border-radius: 6px;
70+ padding: 0;
71+ -webkit-box-shadow: inset 0 2px 1px rgba(0, 0, 0, 0.1);
72+ box-shadow: inset 0 2px 1px rgba(0, 0, 0, 0.1);
73 }
74
75-
76 /* Infinite Progress bar */
77 progress[value].infinite::-webkit-progress-value {
78- background-color: #027ce0;
79- background-size: 15px 15px , 100% 100%, 100% 100%;
80- background-image: -webkit-linear-gradient(135deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
81- -webkit-animation: 1.9s move infinite steps(15);
82- animation: 1.9s move infinite steps(15);
83+ -webkit-appearance: none;
84+ /*-webkit-animation: 1.9s move infinite steps(15);
85+ animation: 1.9s move infinite steps(15);*/
86 }
87
88 /* Animations */
89@@ -87,7 +90,7 @@
90 to { -webkit-transform: rotate(360deg); }
91 }
92
93-@-webkit-keyframes move {
94- 0% { background-position: -100px 0px, 0 0, 0 0 }
95- 100% { background-position: 0px 0px, 0 0, 0 0 }
96-}
97\ No newline at end of file
98+/*@-webkit-keyframes move {
99+ 0% { width: -100px 0, 0 0, 0 0 }
100+ 100% { width: 0 0, 0 0, 0 0 }
101+}*/
102\ No newline at end of file
103
104=== modified file '0.1/ambiance/img/spinner@30.png'
105Binary files 0.1/ambiance/img/spinner@30.png 2013-06-08 14:24:51 +0000 and 0.1/ambiance/img/spinner@30.png 2013-09-28 20:21:05 +0000 differ
106=== modified file '0.1/ambiance/img/spinner@8.png'
107Binary files 0.1/ambiance/img/spinner@8.png 2013-06-08 14:24:51 +0000 and 0.1/ambiance/img/spinner@8.png 2013-09-28 20:21:05 +0000 differ
108=== modified file '0.1/examples/widgets/ProgressBars.html'
109--- 0.1/examples/widgets/ProgressBars.html 2013-07-17 15:27:43 +0000
110+++ 0.1/examples/widgets/ProgressBars.html 2013-09-28 20:21:05 +0000
111@@ -5,18 +5,18 @@
112 This file is part of ubuntu-html5-theme.
113
114 This package is free software; you can redistribute it and/or modify
115- it under the terms of the GNU Lesser General Public License as
116- published by the Free Software Foundation; either version 3 of the
117+ it under the terms of the GNU Lesser General Public License as
118+ published by the Free Software Foundation; either version 3 of the
119 License, or
120 (at your option) any later version.
121-
122+
123 This package is distributed in the hope that it will be useful,
124 but WITHOUT ANY WARRANTY; without even the implied warranty of
125 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
126 GNU General Public License for more details.
127-
128- You should have received a copy of the GNU Lesser General Public
129- License along with this program. If not, see
130+
131+ You should have received a copy of the GNU Lesser General Public
132+ License along with this program. If not, see
133 <http://www.gnu.org/licenses/>.
134 -->
135
136@@ -54,7 +54,9 @@
137 <progress></progress>
138 <progress class="bigger"></progress>
139 </div>
140- <progress value="80" max="100"></progress>
141+ <div class="inset">
142+ <progress value="80" max="100"></progress>
143+ </div>
144 <div class="inset">
145 <progress class="infinite" value="100" max="100"></progress>
146 </div>

Subscribers

People subscribed via source and target branches