Merge lp:~stephen-stewart/snapweb/icons-icons-icons into lp:~snappy-dev/snapweb/trunk
- icons-icons-icons
- Merge into trunk
Proposed by
Stephen Stewart
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Sergio Schvezov | ||||
Approved revision: | 155 | ||||
Merged at revision: | 144 | ||||
Proposed branch: | lp:~stephen-stewart/snapweb/icons-icons-icons | ||||
Merge into: | lp:~snappy-dev/snapweb/trunk | ||||
Diff against target: |
749 lines (+312/-132) 24 files modified
gulpfile.js (+25/-2) package.json (+1/-0) www/src/css/animations.css (+4/-0) www/src/css/banner.css (+5/-3) www/src/css/base.css (+1/-1) www/src/css/headline.css (+10/-0) www/src/css/icon.css (+22/-0) www/src/css/layout.css (+65/-4) www/src/css/snap.css (+13/-12) www/src/css/snaplist.css (+42/-12) www/src/images/cof.svg (+14/-25) www/src/images/default-package-icon.svg (+34/-12) www/src/js/models/snap.js (+4/-2) www/src/js/templates/home.hbs (+5/-1) www/src/js/templates/layout-banner.hbs (+34/-32) www/src/js/templates/snap-detail.hbs (+0/-3) www/src/js/templates/snap-layout.hbs (+15/-10) www/src/js/templates/snap-menu.hbs (+11/-9) www/src/js/templates/snaplist-item.hbs (+2/-2) www/src/js/templates/store.hbs (+0/-1) www/src/js/views/home.js (+2/-0) www/src/js/views/snap-detail.js (+1/-0) www/src/js/views/snap-reviews.js (+1/-1) www/src/js/views/snap-settings.js (+1/-0) |
||||
To merge this branch: | bzr merge lp:~stephen-stewart/snapweb/icons-icons-icons | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sergio Schvezov | Approve | ||
Review via email:
|
Commit message
* create a specific default/missing icon, fixing #1456654
* make icons a consistent size across screen sizes
* remove image background which is pretty but inconvenient... maybe it can come back just off the main body, where it can't be overlaid by an icon
Description of the change
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 'gulpfile.js' | |||
2 | --- gulpfile.js 2015-05-09 09:33:57 +0000 | |||
3 | +++ gulpfile.js 2015-05-26 20:54:26 +0000 | |||
4 | @@ -6,6 +6,7 @@ | |||
5 | 6 | var buffer = require('vinyl-buffer'); | 6 | var buffer = require('vinyl-buffer'); |
6 | 7 | var concat = require('gulp-concat'); | 7 | var concat = require('gulp-concat'); |
7 | 8 | var csso = require('gulp-csso'); | 8 | var csso = require('gulp-csso'); |
8 | 9 | var customMedia = require('postcss-custom-media'); | ||
9 | 9 | var del = require('del'); | 10 | var del = require('del'); |
10 | 10 | var gulp = require('gulp'); | 11 | var gulp = require('gulp'); |
11 | 11 | var gutil = require('gulp-util'); | 12 | var gutil = require('gulp-util'); |
12 | @@ -47,7 +48,7 @@ | |||
13 | 47 | } | 48 | } |
14 | 48 | 49 | ||
15 | 49 | return bundleShared(bundler); | 50 | return bundleShared(bundler); |
17 | 50 | } | 51 | } |
18 | 51 | 52 | ||
19 | 52 | function bundleShared(bundler) { | 53 | function bundleShared(bundler) { |
20 | 53 | return bundler.bundle() | 54 | return bundler.bundle() |
21 | @@ -72,11 +73,33 @@ | |||
22 | 72 | 73 | ||
23 | 73 | // Styles | 74 | // Styles |
24 | 74 | 75 | ||
25 | 76 | |||
26 | 75 | gulp.task('styles', ['styles:clean'], function() { | 77 | gulp.task('styles', ['styles:clean'], function() { |
27 | 76 | var processors = [ | 78 | var processors = [ |
28 | 77 | autoprefixer({browsers: ['last 1 version']}), | 79 | autoprefixer({browsers: ['last 1 version']}), |
30 | 78 | bemlinter('bem') | 80 | bemlinter('bem'), |
31 | 81 | customMedia({ | ||
32 | 82 | extensions: { | ||
33 | 83 | '--xxs': '(min-width: ' + calcWidth(4,8) + 'px)', | ||
34 | 84 | '--xs': '(min-width: ' + calcWidth(5,9) + 'px)', | ||
35 | 85 | '--s': '(min-width: ' + calcWidth(6,10) + 'px)', | ||
36 | 86 | '--m': '(min-width: ' + calcWidth(7) + 'px)', | ||
37 | 87 | '--l': '(min-width: ' + calcWidth(9) + 'px)', | ||
38 | 88 | '--xl': '(min-width: ' + calcWidth(11) + 'px)', | ||
39 | 89 | '--xxl': '(min-width: ' + calcWidth(13) + 'px)', | ||
40 | 90 | '--xxxl': '(min-width: ' + calcWidth(15) + 'px)' | ||
41 | 91 | } | ||
42 | 92 | }) | ||
43 | 79 | ]; | 93 | ]; |
44 | 94 | |||
45 | 95 | function calcWidth(units, padding, width) { | ||
46 | 96 | var scrollbar = 17; | ||
47 | 97 | width = width || 90; // width of an icon in grid style | ||
48 | 98 | padding = padding || 10; | ||
49 | 99 | |||
50 | 100 | return (((width + (padding*2)) * units) + (scrollbar * 2)); | ||
51 | 101 | } | ||
52 | 102 | |||
53 | 80 | return gulp.src([ | 103 | return gulp.src([ |
54 | 81 | 'node_modules/normalize.css/normalize.css', | 104 | 'node_modules/normalize.css/normalize.css', |
55 | 82 | 'www/src/css/**/*.css' | 105 | 'www/src/css/**/*.css' |
56 | 83 | 106 | ||
57 | === modified file 'package.json' | |||
58 | --- package.json 2015-05-26 11:04:20 +0000 | |||
59 | +++ package.json 2015-05-26 20:54:26 +0000 | |||
60 | @@ -37,6 +37,7 @@ | |||
61 | 37 | "lodash": "~3.3.1", | 37 | "lodash": "~3.3.1", |
62 | 38 | "normalize.css": "^3.0.3", | 38 | "normalize.css": "^3.0.3", |
63 | 39 | "postcss-bem-linter": "git://github.com/necolas/postcss-bem-linter", | 39 | "postcss-bem-linter": "git://github.com/necolas/postcss-bem-linter", |
64 | 40 | "postcss-custom-media": "^3.0.0", | ||
65 | 40 | "pretty-bytes": "^1.0.4", | 41 | "pretty-bytes": "^1.0.4", |
66 | 41 | "vinyl-buffer": "~1.0.0", | 42 | "vinyl-buffer": "~1.0.0", |
67 | 42 | "vinyl-source-stream": "~1.1.0", | 43 | "vinyl-source-stream": "~1.1.0", |
68 | 43 | 44 | ||
69 | === added file 'www/src/css/animations.css' | |||
70 | --- www/src/css/animations.css 1970-01-01 00:00:00 +0000 | |||
71 | +++ www/src/css/animations.css 2015-05-26 20:54:26 +0000 | |||
72 | @@ -0,0 +1,4 @@ | |||
73 | 1 | @keyframes rotate { | ||
74 | 2 | from { transform: rotate(0deg) } | ||
75 | 3 | to { transform: rotate(360deg) } | ||
76 | 4 | } | ||
77 | 0 | 5 | ||
78 | === modified file 'www/src/css/banner.css' | |||
79 | --- www/src/css/banner.css 2015-05-08 20:03:48 +0000 | |||
80 | +++ www/src/css/banner.css 2015-05-26 20:54:26 +0000 | |||
81 | @@ -1,12 +1,14 @@ | |||
82 | 1 | /** @define b-banner; weak */ | 1 | /** @define b-banner; weak */ |
83 | 2 | 2 | ||
84 | 3 | .b-banner { | 3 | .b-banner { |
88 | 4 | display:flex; | 4 | background-color:#2f2f2f; |
86 | 5 | align-items:center; | ||
87 | 6 | background-color:#202020; | ||
89 | 7 | color:#efefef; | 5 | color:#efefef; |
90 | 8 | line-height:20px; | 6 | line-height:20px; |
91 | 9 | } | 7 | } |
92 | 8 | .b-banner .b-layout__container { | ||
93 | 9 | display:flex; | ||
94 | 10 | align-items:center; | ||
95 | 11 | } | ||
96 | 10 | 12 | ||
97 | 11 | .b-banner img { | 13 | .b-banner img { |
98 | 12 | display:block; | 14 | display:block; |
99 | 13 | 15 | ||
100 | === modified file 'www/src/css/base.css' | |||
101 | --- www/src/css/base.css 2015-04-30 14:38:12 +0000 | |||
102 | +++ www/src/css/base.css 2015-05-26 20:54:26 +0000 | |||
103 | @@ -13,7 +13,7 @@ | |||
104 | 13 | } | 13 | } |
105 | 14 | 14 | ||
106 | 15 | body { | 15 | body { |
108 | 16 | background: url('../images/image-background-paper.png') repeat-y fixed 50% 0 #f7f7f7; | 16 | background-color:#f7f7f7; |
109 | 17 | } | 17 | } |
110 | 18 | 18 | ||
111 | 19 | a { | 19 | a { |
112 | 20 | 20 | ||
113 | === added file 'www/src/css/headline.css' | |||
114 | --- www/src/css/headline.css 1970-01-01 00:00:00 +0000 | |||
115 | +++ www/src/css/headline.css 2015-05-26 20:54:26 +0000 | |||
116 | @@ -0,0 +1,10 @@ | |||
117 | 1 | /** @define b-headline; weak */ | ||
118 | 2 | |||
119 | 3 | .b-headline { | ||
120 | 4 | } | ||
121 | 5 | |||
122 | 6 | .b-headline__h1 { | ||
123 | 7 | font-size:18px; | ||
124 | 8 | font-weight:400; | ||
125 | 9 | margin:20px 15px 5px 15px; | ||
126 | 10 | } | ||
127 | 0 | 11 | ||
128 | === added file 'www/src/css/icon.css' | |||
129 | --- www/src/css/icon.css 1970-01-01 00:00:00 +0000 | |||
130 | +++ www/src/css/icon.css 2015-05-26 20:54:26 +0000 | |||
131 | @@ -0,0 +1,22 @@ | |||
132 | 1 | .b-icon { | ||
133 | 2 | position:relative; | ||
134 | 3 | display:inline-block; | ||
135 | 4 | } | ||
136 | 5 | |||
137 | 6 | .b-icon::before { | ||
138 | 7 | content: ""; | ||
139 | 8 | position:absolute; | ||
140 | 9 | top:0; | ||
141 | 10 | left:0; | ||
142 | 11 | right:0; | ||
143 | 12 | bottom:0; | ||
144 | 13 | background-color:transparent; | ||
145 | 14 | background-image:url(/public/images/icon-mask.png); | ||
146 | 15 | background-repeat:no-repeat; | ||
147 | 16 | background-position:50% 50%; | ||
148 | 17 | background-size:100% 100%; | ||
149 | 18 | } | ||
150 | 19 | |||
151 | 20 | .b-icon img { | ||
152 | 21 | display:block; | ||
153 | 22 | } | ||
154 | 0 | 23 | ||
155 | === modified file 'www/src/css/layout.css' | |||
156 | --- www/src/css/layout.css 2015-05-08 20:03:48 +0000 | |||
157 | +++ www/src/css/layout.css 2015-05-26 20:54:26 +0000 | |||
158 | @@ -11,12 +11,20 @@ | |||
159 | 11 | 11 | ||
160 | 12 | .b-layout__main { | 12 | .b-layout__main { |
161 | 13 | flex: 1; | 13 | flex: 1; |
163 | 14 | padding:0 3em; | 14 | position:relative; |
164 | 15 | } | 15 | } |
165 | 16 | 16 | ||
169 | 17 | .b-layout__main:empty { | 17 | .b-layout__main:empty::before { |
170 | 18 | opacity:0.5; | 18 | content:""; |
171 | 19 | background:transparent url("/public/images/default-package-icon.svg") 50% 50% no-repeat; | 19 | position:absolute; |
172 | 20 | top:50%; | ||
173 | 21 | left:50%; | ||
174 | 22 | width:128px; | ||
175 | 23 | height:128px; | ||
176 | 24 | margin:-64px 0 0 -64px; | ||
177 | 25 | background:transparent url("/public/images/cof.svg") 50% 50% no-repeat; | ||
178 | 26 | background-size: 100% 100%; | ||
179 | 27 | animation: rotate 3s linear infinite; | ||
180 | 20 | } | 28 | } |
181 | 21 | 29 | ||
182 | 22 | .b-layout__main:empty + .b-layout__footer { | 30 | .b-layout__main:empty + .b-layout__footer { |
183 | @@ -36,3 +44,56 @@ | |||
184 | 36 | width: 100%; | 44 | width: 100%; |
185 | 37 | z-index: 10000; | 45 | z-index: 10000; |
186 | 38 | } | 46 | } |
187 | 47 | |||
188 | 48 | .b-layout__container { | ||
189 | 49 | width:312px; | ||
190 | 50 | margin:0 auto; | ||
191 | 51 | } | ||
192 | 52 | |||
193 | 53 | @media (--xxs) { | ||
194 | 54 | .b-layout__container { | ||
195 | 55 | width: 424px; | ||
196 | 56 | } | ||
197 | 57 | } | ||
198 | 58 | |||
199 | 59 | @media (--xs) { | ||
200 | 60 | .b-layout__container { | ||
201 | 61 | width: 540px; | ||
202 | 62 | } | ||
203 | 63 | } | ||
204 | 64 | |||
205 | 65 | @media (--s) { | ||
206 | 66 | .b-layout__container { | ||
207 | 67 | width: 660px; | ||
208 | 68 | } | ||
209 | 69 | } | ||
210 | 70 | |||
211 | 71 | @media (--m) { | ||
212 | 72 | .b-layout__container { | ||
213 | 73 | width: 770px; | ||
214 | 74 | } | ||
215 | 75 | } | ||
216 | 76 | |||
217 | 77 | @media (--l) { | ||
218 | 78 | .b-layout__container { | ||
219 | 79 | width: 990px; | ||
220 | 80 | } | ||
221 | 81 | } | ||
222 | 82 | |||
223 | 83 | @media (--xl) { | ||
224 | 84 | .b-layout__container { | ||
225 | 85 | width: 1210px; | ||
226 | 86 | } | ||
227 | 87 | } | ||
228 | 88 | |||
229 | 89 | @media (--xxl) { | ||
230 | 90 | .b-layout__container { | ||
231 | 91 | width: 1430px; | ||
232 | 92 | } | ||
233 | 93 | } | ||
234 | 94 | |||
235 | 95 | @media (--xxxl) { | ||
236 | 96 | .b-layout__container { | ||
237 | 97 | width: 1650px; | ||
238 | 98 | } | ||
239 | 99 | } | ||
240 | 39 | 100 | ||
241 | === modified file 'www/src/css/snap.css' | |||
242 | --- www/src/css/snap.css 2015-05-08 20:03:48 +0000 | |||
243 | +++ www/src/css/snap.css 2015-05-26 20:54:26 +0000 | |||
244 | @@ -3,23 +3,19 @@ | |||
245 | 3 | .b-snap { | 3 | .b-snap { |
246 | 4 | } | 4 | } |
247 | 5 | 5 | ||
252 | 6 | .b-snap__icon { | 6 | .b-snap .b-icon { |
249 | 7 | } | ||
250 | 8 | .b-snap__icon img { | ||
251 | 9 | display:block; | ||
253 | 10 | } | 7 | } |
254 | 11 | 8 | ||
255 | 12 | .b-snap__banner { | 9 | .b-snap__banner { |
256 | 13 | display: flex; | 10 | display: flex; |
257 | 14 | line-height:1.3; | 11 | line-height:1.3; |
260 | 15 | margin:0 -3em; | 12 | padding:1.3em 0; |
259 | 16 | padding:1.3em 3em 1.3em; | ||
261 | 17 | align-items: flex-start; | 13 | align-items: flex-start; |
262 | 18 | background-color:rgba(255,255,255,0.7); | ||
263 | 19 | } | 14 | } |
264 | 20 | 15 | ||
265 | 21 | .b-snap__meta { | 16 | .b-snap__meta { |
266 | 22 | flex: 2; | 17 | flex: 2; |
267 | 18 | margin-left:15px; | ||
268 | 23 | } | 19 | } |
269 | 24 | 20 | ||
270 | 25 | .b-snap__meta > * { | 21 | .b-snap__meta > * { |
271 | @@ -36,13 +32,14 @@ | |||
272 | 36 | 32 | ||
273 | 37 | .b-snap__navigation { | 33 | .b-snap__navigation { |
274 | 38 | background-color:rgba(255,255,255,0.5); | 34 | background-color:rgba(255,255,255,0.5); |
275 | 39 | display: flex; | ||
276 | 40 | align-items: center; | ||
277 | 41 | margin:0 0 1em 0; | ||
278 | 42 | border-top:1px solid #efefef; | 35 | border-top:1px solid #efefef; |
279 | 43 | border-bottom:1px solid #ddd; | 36 | border-bottom:1px solid #ddd; |
282 | 44 | margin:0 -3em 1em -3em; | 37 | margin:0 0 1em 0; |
283 | 45 | padding:0 3em; | 38 | } |
284 | 39 | |||
285 | 40 | .b-snap__navigation .b-layout__container { | ||
286 | 41 | display: flex; | ||
287 | 42 | align-items: center; | ||
288 | 46 | } | 43 | } |
289 | 47 | 44 | ||
290 | 48 | .b-snap__nav-item { | 45 | .b-snap__nav-item { |
291 | @@ -64,3 +61,7 @@ | |||
292 | 64 | right:0; | 61 | right:0; |
293 | 65 | height:3px; | 62 | height:3px; |
294 | 66 | } | 63 | } |
295 | 64 | |||
296 | 65 | .b-snap__tab-content { | ||
297 | 66 | padding:1.3em 3em 1.3em; | ||
298 | 67 | } | ||
299 | 67 | 68 | ||
300 | === modified file 'www/src/css/snaplist.css' | |||
301 | --- www/src/css/snaplist.css 2015-05-08 20:03:48 +0000 | |||
302 | +++ www/src/css/snaplist.css 2015-05-26 20:54:26 +0000 | |||
303 | @@ -5,8 +5,10 @@ | |||
304 | 5 | 5 | ||
305 | 6 | .b-snaplist__item { | 6 | .b-snaplist__item { |
306 | 7 | cursor: pointer; | 7 | cursor: pointer; |
307 | 8 | font-size:0; | ||
308 | 8 | } | 9 | } |
309 | 9 | 10 | ||
310 | 11 | |||
311 | 10 | /** grid style **/ | 12 | /** grid style **/ |
312 | 11 | 13 | ||
313 | 12 | .b-snaplist_grid { | 14 | .b-snaplist_grid { |
314 | @@ -15,16 +17,8 @@ | |||
315 | 15 | } | 17 | } |
316 | 16 | 18 | ||
317 | 17 | .b-snaplist_grid .b-snaplist__item { | 19 | .b-snaplist_grid .b-snaplist__item { |
328 | 18 | flex: 0 1 20%; | 20 | flex: 0 1 auto; |
329 | 19 | padding:10px; | 21 | padding:7px; |
320 | 20 | } | ||
321 | 21 | |||
322 | 22 | .b-snaplist_grid .b-snaplist__icon { | ||
323 | 23 | } | ||
324 | 24 | |||
325 | 25 | .b-snaplist_grid .b-snaplist__icon img { | ||
326 | 26 | border-radius:15%; | ||
327 | 27 | width:100%; | ||
330 | 28 | } | 22 | } |
331 | 29 | 23 | ||
332 | 30 | .b-snaplist_grid .b-snaplist__name { | 24 | .b-snaplist_grid .b-snaplist__name { |
333 | @@ -32,14 +26,44 @@ | |||
334 | 32 | white-space: nowrap; | 26 | white-space: nowrap; |
335 | 33 | overflow: hidden; | 27 | overflow: hidden; |
336 | 34 | text-overflow: ellipsis; | 28 | text-overflow: ellipsis; |
337 | 29 | font-size:12px; | ||
338 | 30 | color:#999; | ||
339 | 31 | margin-top:4px; | ||
340 | 32 | } | ||
341 | 33 | |||
342 | 34 | .b-snaplist_grid .b-snaplist__name, | ||
343 | 35 | .b-snaplist_grid .b-icon img { | ||
344 | 36 | width:90px; | ||
345 | 35 | } | 37 | } |
346 | 36 | 38 | ||
347 | 37 | .b-snaplist_grid .b-snaplist__name ~ * { | 39 | .b-snaplist_grid .b-snaplist__name ~ * { |
348 | 38 | display:none; | 40 | display:none; |
349 | 39 | } | 41 | } |
350 | 40 | 42 | ||
351 | 43 | @media (--xxs) { | ||
352 | 44 | .b-snaplist_grid .b-snaplist__item { | ||
353 | 45 | padding:8px; | ||
354 | 46 | } | ||
355 | 47 | } | ||
356 | 48 | |||
357 | 49 | @media (--xs) { | ||
358 | 50 | .b-snaplist_grid .b-snaplist__item { | ||
359 | 51 | padding:9px; | ||
360 | 52 | } | ||
361 | 53 | } | ||
362 | 54 | |||
363 | 55 | @media (--s) { | ||
364 | 56 | .b-snaplist_grid .b-snaplist__item { | ||
365 | 57 | padding:10px; | ||
366 | 58 | } | ||
367 | 59 | } | ||
368 | 60 | |||
369 | 41 | /** row style **/ | 61 | /** row style **/ |
370 | 42 | 62 | ||
371 | 63 | .b-snaplist_row { | ||
372 | 64 | margin:3em; | ||
373 | 65 | } | ||
374 | 66 | |||
375 | 43 | .b-snaplist_row .b-snaplist__item { | 67 | .b-snaplist_row .b-snaplist__item { |
376 | 44 | width:100%; | 68 | width:100%; |
377 | 45 | display:flex; | 69 | display:flex; |
378 | @@ -48,17 +72,23 @@ | |||
379 | 48 | border-radius:4px; | 72 | border-radius:4px; |
380 | 49 | margin-bottom:0.6em; | 73 | margin-bottom:0.6em; |
381 | 50 | background-color:#fff; | 74 | background-color:#fff; |
382 | 75 | font-size:13px; | ||
383 | 51 | } | 76 | } |
384 | 52 | 77 | ||
385 | 53 | .b-snaplist_row .b-snaplist__item:last-child { | 78 | .b-snaplist_row .b-snaplist__item:last-child { |
386 | 54 | margin-bottom:0; | 79 | margin-bottom:0; |
387 | 55 | } | 80 | } |
388 | 56 | 81 | ||
390 | 57 | .b-snaplist_row .b-snaplist__icon { | 82 | |
391 | 83 | .b-snaplist_row .b-icon { | ||
392 | 58 | flex:0 0 40px; | 84 | flex:0 0 40px; |
393 | 59 | } | 85 | } |
394 | 60 | 86 | ||
396 | 61 | .b-snaplist_row .b-snaplist__icon img { | 87 | .b-snaplist_row .b-icon::before { |
397 | 88 | background-image: url(/public/images/icon-mask-on-white.png); | ||
398 | 89 | } | ||
399 | 90 | |||
400 | 91 | .b-snaplist_row .b-icon img { | ||
401 | 62 | display:block; | 92 | display:block; |
402 | 63 | width: 40px; | 93 | width: 40px; |
403 | 64 | height: 40px; | 94 | height: 40px; |
404 | 65 | 95 | ||
405 | === modified file 'www/src/images/cof.svg' | |||
406 | --- www/src/images/cof.svg 2015-04-24 23:05:53 +0000 | |||
407 | +++ www/src/images/cof.svg 2015-05-26 20:54:26 +0000 | |||
408 | @@ -1,27 +1,16 @@ | |||
409 | 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
435 | 2 | <!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In --> | 2 | <!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> |
436 | 3 | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [ | 3 | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> |
437 | 4 | <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/"> | 4 | <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" |
438 | 5 | ]> | 5 | width="256px" height="256px" viewBox="0 0 256 256" enable-background="new 0 0 256 256" xml:space="preserve"> |
439 | 6 | <svg version="1.1" | 6 | <path fill="#FFFFFF" d="M128,0C57.4,0,0,57.4,0,128s57.4,128,128,128s128-57.4,128-128S198.6,0,128,0z M152.4,52.4 |
440 | 7 | xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" | 7 | C156.6,45,166,42.6,173.4,46.8s9.799,13.601,5.6,21c-4.199,7.4-13.6,9.8-21,5.601C150.6,69.2,148,59.8,152.4,52.4z M48.2,143.4 |
441 | 8 | x="0px" y="0px" width="285px" height="285px" viewBox="-0.866 -0.866 285 285" enable-background="new -0.866 -0.866 285 285" | 8 | c-8.4,0-15.4-7-15.4-15.4s6.8-15.4,15.4-15.4c8.6,0,15.399,6.801,15.399,15.4C63.6,136.4,56.6,143.4,48.2,143.4z M61.8,144.801 |
442 | 9 | xml:space="preserve"> | 9 | c4.8-4,8-10,8-16.801c0-6.8-3-12.8-8-16.8C66,95,76,81.4,89.4,72.4L100.6,91.2c-11.6,8.2-19,21.6-19,36.8 |
443 | 10 | <defs> | 10 | c0,15.199,7.601,28.6,19,36.801L89.4,183.6C76,174.6,66,160.801,61.8,144.801z M173.4,209.199c-7.4,4.201-16.801,1.801-21-5.6 |
444 | 11 | </defs> | 11 | c-4.201-7.4-1.801-16.799,5.6-21c7.4-4.199,16.801-1.799,21,5.6C183.199,195.6,180.801,205,173.4,209.199z M173.4,175.6 |
445 | 12 | <path fill="#FFFFFF" d="M283.465,141.734c0,78.273-63.457,141.73-141.734,141.73S0,220.008,0,141.734C0,63.455,63.453,0,141.73,0 | 12 | c-5.801-2.199-12.6-2-18.4,1.4s-9.6,9-10.4,15.199c-5.6,1.602-11.6,2.4-17.8,2.4c-10.6,0-20.6-2.4-29.6-7l10.6-19.199 |
446 | 13 | S283.465,63.455,283.465,141.734z"/> | 13 | c5.8,2.799,12.2,4.199,19,4.199c23.399,0,42.8-18,44.8-40.799l22,0.398C192,149.199,184.6,164.4,173.4,175.6z M171.199,124 |
447 | 14 | <path d="M45.356,122.812c-10.453,0-18.923,8.47-18.923,18.923c0,10.449,8.47,18.92,18.923,18.92c10.449,0,18.92-8.471,18.92-18.92 | 14 | c-2-23-21.199-41-44.799-41c-6.801,0-13.2,1.4-19,4.2L96.8,68c9-4.4,19-7,29.601-7c6.199,0,12.199,0.8,17.799,2.4 |
448 | 15 | C64.276,131.281,55.806,122.812,45.356,122.812z M180.463,208.814c-9.051,5.225-12.149,16.793-6.926,25.84 | 15 | c1,6.199,4.602,11.8,10.4,15.199C160.4,82,167.199,82.4,173,80c11.4,11.2,18.801,26.4,19.801,43.4L171.199,124z"/> |
424 | 16 | c5.226,9.051,16.793,12.151,25.844,6.926c9.048-5.224,12.148-16.792,6.923-25.842C201.08,206.691,189.511,203.59,180.463,208.814z | ||
425 | 17 | M86.458,141.732c0-18.701,9.293-35.219,23.504-45.221L96.128,73.338c-16.56,11.064-28.878,27.978-33.995,47.788 | ||
426 | 18 | c5.977,4.872,9.796,12.291,9.796,20.608c0,8.315-3.819,15.734-9.797,20.605c5.116,19.812,17.435,36.726,33.995,47.789l13.835-23.175 | ||
427 | 19 | C95.751,176.953,86.458,160.436,86.458,141.732z M141.733,86.457c28.877,0,52.564,22.141,55.047,50.373l26.968-0.394 | ||
428 | 20 | c-1.327-20.844-10.432-39.562-24.425-53.319c-7.194,2.718-15.505,2.306-22.688-1.842c-7.192-4.152-11.705-11.156-12.941-18.757 | ||
429 | 21 | c-6.992-1.935-14.351-2.99-21.96-2.99c-13.086,0-25.449,3.072-36.431,8.512l13.146,23.56 | ||
430 | 22 | C125.526,88.307,133.412,86.457,141.733,86.457z M141.733,197.008c-8.322,0-16.207-1.85-23.285-5.143L105.3,215.427 | ||
431 | 23 | c10.983,5.438,23.347,8.511,36.433,8.511c7.609,0,14.968-1.055,21.961-2.99c1.236-7.601,5.75-14.605,12.943-18.76 | ||
432 | 24 | c7.183-4.146,15.494-4.558,22.688-1.839c13.992-13.758,23.097-32.476,24.422-53.32l-26.968-0.394 | ||
433 | 25 | C194.298,174.871,170.61,197.008,141.733,197.008z M180.46,74.649c9.05,5.227,20.619,2.126,25.842-6.921 | ||
434 | 26 | c5.226-9.051,2.128-20.619-6.923-25.845c-9.049-5.224-20.617-2.124-25.843,6.927C168.312,57.857,171.412,69.426,180.46,74.649z"/> | ||
449 | 27 | </svg> | 16 | </svg> |
450 | 28 | 17 | ||
451 | === modified file 'www/src/images/default-package-icon.svg' | |||
452 | --- www/src/images/default-package-icon.svg 2015-04-30 13:42:46 +0000 | |||
453 | +++ www/src/images/default-package-icon.svg 2015-05-26 20:54:26 +0000 | |||
454 | @@ -1,16 +1,38 @@ | |||
455 | 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
456 | 2 | <!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> | 2 | <!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> |
457 | 3 | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> | 3 | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> |
470 | 4 | <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" | 4 | <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="256px" |
471 | 5 | width="256px" height="256px" viewBox="0 0 256 256" enable-background="new 0 0 256 256" xml:space="preserve"> | 5 | height="256px" viewBox="0 0 256 256" enable-background="new 0 0 256 256" xml:space="preserve"> |
472 | 6 | <path fill="#FFFFFF" d="M128,64c-35.3,0-64,28.7-64,64c0,35.3,28.7,64,64,64c35.3,0,64-28.7,64-64C192,92.7,163.3,64,128,64z | 6 | <g id="Layer_1"> |
473 | 7 | M140.2,90.2c2.1-3.7,6.8-4.9,10.5-2.8c3.7,2.1,4.9,6.8,2.8,10.5c-2.1,3.7-6.8,4.9-10.5,2.8C139.3,98.6,138,93.9,140.2,90.2z | 7 | <rect fill="#EFEFEF" width="256" height="256"/> |
474 | 8 | M88.1,135.7c-4.2,0-7.7-3.5-7.7-7.7c0-4.2,3.4-7.7,7.7-7.7c4.3,0,7.7,3.4,7.7,7.7C95.8,132.2,92.3,135.7,88.1,135.7z M94.9,136.4 | 8 | </g> |
475 | 9 | c2.4-2,4-5,4-8.4c0-3.4-1.5-6.4-4-8.4c2.1-8.1,7.1-14.9,13.8-19.4l5.6,9.4c-5.8,4.1-9.5,10.8-9.5,18.4c0,7.6,3.8,14.3,9.5,18.4 | 9 | <g id="Layer_2"> |
476 | 10 | l-5.6,9.4C102,151.3,97,144.4,94.9,136.4z M150.7,168.6c-3.7,2.1-8.4,0.9-10.5-2.8c-2.1-3.7-0.9-8.4,2.8-10.5 | 10 | <line fill="none" stroke="#DBDBDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="256"/> |
477 | 11 | c3.7-2.1,8.4-0.9,10.5,2.8C155.6,161.8,154.4,166.5,150.7,168.6z M150.7,151.8c-2.9-1.1-6.3-1-9.2,0.7c-2.9,1.7-4.8,4.5-5.2,7.6 | 11 | <line fill="none" stroke="#DBDBDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="256"/> |
478 | 12 | c-2.8,0.8-5.8,1.2-8.9,1.2c-5.3,0-10.3-1.2-14.8-3.5l5.3-9.6c2.9,1.4,6.1,2.1,9.5,2.1c11.7,0,21.4-9,22.4-20.4l11,0.2 | 12 | <line fill="none" stroke="#C1C1C1" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="256"/> |
479 | 13 | C160,138.6,156.3,146.2,150.7,151.8z M149.6,126c-1-11.5-10.6-20.5-22.4-20.5c-3.4,0-6.6,0.7-9.5,2.1l-5.3-9.6 | 13 | <line fill="#EFEFEF" stroke="#AAAAAA" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="256"/> |
480 | 14 | c4.5-2.2,9.5-3.5,14.8-3.5c3.1,0,6.1,0.4,8.9,1.2c0.5,3.1,2.3,5.9,5.2,7.6c2.9,1.7,6.3,1.9,9.2,0.7c5.7,5.6,9.4,13.2,9.9,21.7 | 14 | <line fill="none" stroke="#DBDBDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="256"/> |
481 | 15 | L149.6,126z"/> | 15 | <line fill="none" stroke="#C1C1C1" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="256"/> |
482 | 16 | <line fill="none" stroke="#DBDBDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="256"/> | ||
483 | 17 | <line fill="none" stroke="#DBDBDB" stroke-miterlimit="10" x1="0" y1="224" x2="256" y2="224"/> | ||
484 | 18 | <line fill="none" stroke="#DBDBDB" stroke-miterlimit="10" x1="0" y1="160" x2="256" y2="160"/> | ||
485 | 19 | <line fill="none" stroke="#C1C1C1" stroke-miterlimit="10" x1="0" y1="192" x2="256" y2="192"/> | ||
486 | 20 | <line fill="#EFEFEF" stroke="#AAAAAA" stroke-miterlimit="10" x1="0" y1="128" x2="256" y2="128"/> | ||
487 | 21 | <line fill="none" stroke="#DBDBDB" stroke-miterlimit="10" x1="0" y1="96" x2="256" y2="96"/> | ||
488 | 22 | <line fill="none" stroke="#C1C1C1" stroke-miterlimit="10" x1="0" y1="64" x2="256" y2="64"/> | ||
489 | 23 | <line fill="none" stroke="#DBDBDB" stroke-miterlimit="10" x1="0" y1="32" x2="256" y2="32"/> | ||
490 | 24 | </g> | ||
491 | 25 | <g id="Layer_3"> | ||
492 | 26 | <circle fill="#EFEFEF" cx="128" cy="128" r="64"/> | ||
493 | 27 | <path fill="#EFEFEF" stroke="#AAAAAA" stroke-miterlimit="10" d="M128,64c-35.3,0-64,28.7-64,64s28.7,64,64,64s64-28.7,64-64 | ||
494 | 28 | S163.3,64,128,64z M140.2,90.2c2.1-3.7,6.8-4.9,10.5-2.8s4.899,6.8,2.8,10.5c-2.1,3.7-6.8,4.9-10.5,2.8 | ||
495 | 29 | C139.3,98.6,138,93.9,140.2,90.2z M88.1,135.7c-4.2,0-7.7-3.5-7.7-7.7s3.4-7.7,7.7-7.7c4.3,0,7.7,3.4,7.7,7.7 | ||
496 | 30 | C95.8,132.2,92.3,135.7,88.1,135.7z M94.9,136.4c2.4-2,4-5,4-8.4c0-3.4-1.5-6.4-4-8.4c2.1-8.1,7.1-14.9,13.8-19.4l5.6,9.4 | ||
497 | 31 | c-5.8,4.1-9.5,10.8-9.5,18.4c0,7.6,3.8,14.3,9.5,18.4l-5.6,9.399C102,151.3,97,144.4,94.9,136.4z M150.7,168.6 | ||
498 | 32 | c-3.7,2.101-8.4,0.9-10.5-2.8c-2.101-3.7-0.9-8.399,2.8-10.5c3.7-2.1,8.4-0.899,10.5,2.8C155.6,161.8,154.4,166.5,150.7,168.6z | ||
499 | 33 | M150.7,151.8c-2.9-1.1-6.3-1-9.2,0.7s-4.8,4.5-5.2,7.6c-2.8,0.801-5.8,1.2-8.9,1.2c-5.3,0-10.3-1.2-14.8-3.5l5.3-9.6 | ||
500 | 34 | c2.9,1.399,6.1,2.1,9.5,2.1c11.7,0,21.4-9,22.4-20.399l11,0.199C160,138.6,156.3,146.2,150.7,151.8z M149.6,126 | ||
501 | 35 | c-1-11.5-10.6-20.5-22.399-20.5c-3.4,0-6.6,0.7-9.5,2.1l-5.3-9.6c4.5-2.2,9.5-3.5,14.8-3.5c3.1,0,6.1,0.4,8.899,1.2 | ||
502 | 36 | c0.5,3.1,2.301,5.9,5.2,7.6c2.9,1.7,6.3,1.9,9.2,0.7c5.7,5.6,9.4,13.2,9.9,21.7L149.6,126z"/> | ||
503 | 37 | </g> | ||
504 | 16 | </svg> | 38 | </svg> |
505 | 17 | 39 | ||
506 | === added file 'www/src/images/icon-mask-on-white.png' | |||
507 | 18 | Binary files www/src/images/icon-mask-on-white.png 1970-01-01 00:00:00 +0000 and www/src/images/icon-mask-on-white.png 2015-05-26 20:54:26 +0000 differ | 40 | Binary files www/src/images/icon-mask-on-white.png 1970-01-01 00:00:00 +0000 and www/src/images/icon-mask-on-white.png 2015-05-26 20:54:26 +0000 differ |
508 | === added file 'www/src/images/icon-mask.png' | |||
509 | 19 | Binary files www/src/images/icon-mask.png 1970-01-01 00:00:00 +0000 and www/src/images/icon-mask.png 2015-05-26 20:54:26 +0000 differ | 41 | Binary files www/src/images/icon-mask.png 1970-01-01 00:00:00 +0000 and www/src/images/icon-mask.png 2015-05-26 20:54:26 +0000 differ |
510 | === modified file 'www/src/js/models/snap.js' | |||
511 | --- www/src/js/models/snap.js 2015-05-26 11:53:46 +0000 | |||
512 | +++ www/src/js/models/snap.js 2015-05-26 20:54:26 +0000 | |||
513 | @@ -185,14 +185,16 @@ | |||
514 | 185 | if (response.hasOwnProperty('download_size')) { | 185 | if (response.hasOwnProperty('download_size')) { |
515 | 186 | this.set( | 186 | this.set( |
516 | 187 | //jscs:disable requireCamelCaseOrUpperCaseIdentifiers | 187 | //jscs:disable requireCamelCaseOrUpperCaseIdentifiers |
518 | 188 | 'prettyDownloadSize', this.prettifyBytes(Number(response.download_size)) | 188 | 'prettyDownloadSize', |
519 | 189 | this.prettifyBytes(Number(response.download_size)) | ||
520 | 189 | ); | 190 | ); |
521 | 190 | } | 191 | } |
522 | 191 | 192 | ||
523 | 192 | if (response.hasOwnProperty('installed_size')) { | 193 | if (response.hasOwnProperty('installed_size')) { |
524 | 193 | this.set( | 194 | this.set( |
525 | 194 | //jscs:disable requireCamelCaseOrUpperCaseIdentifiers | 195 | //jscs:disable requireCamelCaseOrUpperCaseIdentifiers |
527 | 195 | 'prettyInstalledSize', this.prettifyBytes(Number(response.installed_size)) | 196 | 'prettyInstalledSize', |
528 | 197 | this.prettifyBytes(Number(response.installed_size)) | ||
529 | 196 | ); | 198 | ); |
530 | 197 | } | 199 | } |
531 | 198 | 200 | ||
532 | 199 | 201 | ||
533 | === modified file 'www/src/js/templates/home.hbs' | |||
534 | --- www/src/js/templates/home.hbs 2015-05-02 19:00:37 +0000 | |||
535 | +++ www/src/js/templates/home.hbs 2015-05-26 20:54:26 +0000 | |||
536 | @@ -1,2 +1,6 @@ | |||
538 | 1 | <h1>Installed apps</h1> | 1 | <div class="b-headline"> |
539 | 2 | <div class="b-layout__container"> | ||
540 | 3 | <h1 class="b-headline__h1">Installed snaps</h1> | ||
541 | 4 | </div> | ||
542 | 5 | </div> | ||
543 | 2 | <div class="region-installed"></div> | 6 | <div class="region-installed"></div> |
544 | 3 | 7 | ||
545 | === modified file 'www/src/js/templates/layout-banner.hbs' | |||
546 | --- www/src/js/templates/layout-banner.hbs 2015-05-08 20:03:48 +0000 | |||
547 | +++ www/src/js/templates/layout-banner.hbs 2015-05-26 20:54:26 +0000 | |||
548 | @@ -1,32 +1,34 @@ | |||
581 | 1 | <div class="b-banner__brand"> | 1 | <div class="b-layout__container"> |
582 | 2 | <div class="b-banner__nav-item{{#if isHomeActive }} b-banner__nav-item_active{{/if}}"> | 2 | <div class="b-banner__brand"> |
583 | 3 | <a href="/"> | 3 | <div class="b-banner__nav-item{{#if isHomeActive }} b-banner__nav-item_active{{/if}}"> |
584 | 4 | <img src="/public/images/cof.svg" height="30" width="30"> | 4 | <a href="/"> |
585 | 5 | <span>{{ name }} {{ subname }}</span> | 5 | <img src="/public/images/cof.svg" height="30" width="30"> |
586 | 6 | </a> | 6 | <span>{{ name }} {{ subname }}</span> |
587 | 7 | </div> | 7 | </a> |
588 | 8 | </div> | 8 | </div> |
589 | 9 | <div class="b-banner__primary-nav"> | 9 | </div> |
590 | 10 | <div class="b-banner__nav-item{{#if isStoreActive }} b-banner__nav-item_active{{/if}}"> | 10 | <div class="b-banner__primary-nav"> |
591 | 11 | <a href="/store"> | 11 | <div class="b-banner__nav-item{{#if isStoreActive }} b-banner__nav-item_active{{/if}}"> |
592 | 12 | Snappy store | 12 | <a href="/store"> |
593 | 13 | </a> | 13 | Snappy store |
594 | 14 | </div> | 14 | </a> |
595 | 15 | </div> | 15 | </div> |
596 | 16 | <!-- | 16 | </div> |
597 | 17 | <div class="b-banner__search"> | 17 | <!-- |
598 | 18 | <form class="b-banner__form" action="/search" method="GET"> | 18 | <div class="b-banner__search"> |
599 | 19 | <input class="b-banner__input" type="search" name="q" placeholder="Search for snaps" value="{{ query }}"> | 19 | <form class="b-banner__form" action="/search" method="GET"> |
600 | 20 | <div class="b-banner__nav-item{{#if isSearchActive }} b-banner__nav-item_active{{/if}}"> | 20 | <input class="b-banner__input" type="search" name="q" placeholder="Search for snaps" value="{{ query }}"> |
601 | 21 | <button type="submit" class="b-banner__submit"></button> | 21 | <div class="b-banner__nav-item{{#if isSearchActive }} b-banner__nav-item_active{{/if}}"> |
602 | 22 | </div> | 22 | <button type="submit" class="b-banner__submit"></button> |
603 | 23 | </form> | 23 | </div> |
604 | 24 | </div> | 24 | </form> |
605 | 25 | <div class="b-banner__secondary-nav"> | 25 | </div> |
606 | 26 | <div class="b-banner__nav-item{{#if isSystemActive }} b-banner__nav-item_active{{/if}}"> | 26 | <div class="b-banner__secondary-nav"> |
607 | 27 | <a href="/system-settings"> | 27 | <div class="b-banner__nav-item{{#if isSystemActive }} b-banner__nav-item_active{{/if}}"> |
608 | 28 | <img src="/public/images/settings.svg" height="30" width="30"> | 28 | <a href="/system-settings"> |
609 | 29 | </a> | 29 | <img src="/public/images/settings.svg" height="30" width="30"> |
610 | 30 | </div> | 30 | </a> |
611 | 31 | </div> | 31 | </div> |
612 | 32 | --> | 32 | </div> |
613 | 33 | --> | ||
614 | 34 | </div> | ||
615 | 33 | 35 | ||
616 | === modified file 'www/src/js/templates/snap-detail.hbs' | |||
617 | --- www/src/js/templates/snap-detail.hbs 2015-05-26 11:06:44 +0000 | |||
618 | +++ www/src/js/templates/snap-detail.hbs 2015-05-26 20:54:26 +0000 | |||
619 | @@ -1,3 +0,0 @@ | |||
620 | 1 | <div class="b-snap__icon"> | ||
621 | 2 | <img src="{{ icon }}" width="256" height="256"> | ||
622 | 3 | </div> | ||
623 | 4 | 0 | ||
624 | === modified file 'www/src/js/templates/snap-layout.hbs' | |||
625 | --- www/src/js/templates/snap-layout.hbs 2015-05-08 13:11:16 +0000 | |||
626 | +++ www/src/js/templates/snap-layout.hbs 2015-05-26 20:54:26 +0000 | |||
627 | @@ -1,13 +1,18 @@ | |||
638 | 1 | <div class="b-snap__banner"> | 1 | <div class="b-layout__container"> |
639 | 2 | <div class="b-snap__meta"> | 2 | <div class="b-snap__banner"> |
640 | 3 | <h1 class="b-snap__title">{{ name }} {{ version }} {{ binary_filesize }}</h1> | 3 | <div class="b-icon"> |
641 | 4 | <p> | 4 | <img src="{{ icon }}" width="70" height="70"> |
642 | 5 | <span class="b-snap__origin" title="Origin">{{ origin }}</span> | 5 | </div> |
643 | 6 | <span class="b-snap__filesize" title="Package filesize">{{ binary_filesize}}</span> | 6 | <div class="b-snap__meta"> |
644 | 7 | </p> | 7 | <h1 class="b-snap__title">{{ name }} {{ version }} {{ binary_filesize }}</h1> |
645 | 8 | </div> | 8 | <p> |
646 | 9 | <div class="b-snap__actions"> | 9 | <span title="Vendor">{{ vendor }}</span> |
647 | 10 | {{> installer}} | 10 | <span>{{ binary_filesize}}</span> |
648 | 11 | </p> | ||
649 | 12 | </div> | ||
650 | 13 | <div class="b-snap__actions"> | ||
651 | 14 | {{> installer}} | ||
652 | 15 | </div> | ||
653 | 11 | </div> | 16 | </div> |
654 | 12 | </div> | 17 | </div> |
655 | 13 | <div class="region-menu"></div> | 18 | <div class="region-menu"></div> |
656 | 14 | 19 | ||
657 | === modified file 'www/src/js/templates/snap-menu.hbs' | |||
658 | --- www/src/js/templates/snap-menu.hbs 2015-05-02 09:56:14 +0000 | |||
659 | +++ www/src/js/templates/snap-menu.hbs 2015-05-26 20:54:26 +0000 | |||
660 | @@ -1,9 +1,11 @@ | |||
670 | 1 | <a class="b-snap__nav-item" href="details"> | 1 | <div class="b-layout__container"> |
671 | 2 | Details | 2 | <a class="b-snap__nav-item" href="details"> |
672 | 3 | </a> | 3 | Details |
673 | 4 | <a class="b-snap__nav-item" href="reviews"> | 4 | </a> |
674 | 5 | Reviews | 5 | <a class="b-snap__nav-item" href="reviews"> |
675 | 6 | </a> | 6 | Reviews |
676 | 7 | <a class="b-snap__nav-item" href="settings"> | 7 | </a> |
677 | 8 | Settings | 8 | <a class="b-snap__nav-item" href="settings"> |
678 | 9 | </a> | 9 | Settings |
679 | 10 | </a> | ||
680 | 11 | </div> | ||
681 | 10 | 12 | ||
682 | === modified file 'www/src/js/templates/snaplist-item.hbs' | |||
683 | --- www/src/js/templates/snaplist-item.hbs 2015-05-08 13:11:16 +0000 | |||
684 | +++ www/src/js/templates/snaplist-item.hbs 2015-05-26 20:54:26 +0000 | |||
685 | @@ -1,5 +1,5 @@ | |||
688 | 1 | <div class="b-snaplist__icon"> | 1 | <div class="b-icon"> |
689 | 2 | <img src="{{ icon }}" alt="{{ name }} icon"> | 2 | <img src="{{ icon }}" width="90" height="90"> |
690 | 3 | </div> | 3 | </div> |
691 | 4 | <div class="b-snaplist__name">{{ name }}</div> | 4 | <div class="b-snaplist__name">{{ name }}</div> |
692 | 5 | {{!-- only name is shown in grid view, everything after is hidden --}} | 5 | {{!-- only name is shown in grid view, everything after is hidden --}} |
693 | 6 | 6 | ||
694 | === modified file 'www/src/js/templates/store.hbs' | |||
695 | --- www/src/js/templates/store.hbs 2015-05-02 19:00:37 +0000 | |||
696 | +++ www/src/js/templates/store.hbs 2015-05-26 20:54:26 +0000 | |||
697 | @@ -1,2 +1,1 @@ | |||
698 | 1 | <h1>Store Snaps</h1> | ||
699 | 2 | <div class="region-product"></div> | 1 | <div class="region-product"></div> |
700 | 3 | 2 | ||
701 | === modified file 'www/src/js/views/home.js' | |||
702 | --- www/src/js/views/home.js 2015-04-24 20:47:44 +0000 | |||
703 | +++ www/src/js/views/home.js 2015-05-26 20:54:26 +0000 | |||
704 | @@ -6,6 +6,8 @@ | |||
705 | 6 | 6 | ||
706 | 7 | module.exports = Backbone.Marionette.LayoutView.extend({ | 7 | module.exports = Backbone.Marionette.LayoutView.extend({ |
707 | 8 | 8 | ||
708 | 9 | className: 'b-layout__container', | ||
709 | 10 | |||
710 | 9 | template : function() { | 11 | template : function() { |
711 | 10 | return template(); | 12 | return template(); |
712 | 11 | }, | 13 | }, |
713 | 12 | 14 | ||
714 | === modified file 'www/src/js/views/snap-detail.js' | |||
715 | --- www/src/js/views/snap-detail.js 2015-04-11 15:14:07 +0000 | |||
716 | +++ www/src/js/views/snap-detail.js 2015-05-26 20:54:26 +0000 | |||
717 | @@ -4,6 +4,7 @@ | |||
718 | 4 | var template = require('../templates/snap-detail.hbs'); | 4 | var template = require('../templates/snap-detail.hbs'); |
719 | 5 | 5 | ||
720 | 6 | module.exports = Backbone.Marionette.ItemView.extend({ | 6 | module.exports = Backbone.Marionette.ItemView.extend({ |
721 | 7 | className: 'b-snap__tab-content', | ||
722 | 7 | template: function(model) { | 8 | template: function(model) { |
723 | 8 | return template(model); | 9 | return template(model); |
724 | 9 | }, | 10 | }, |
725 | 10 | 11 | ||
726 | === modified file 'www/src/js/views/snap-reviews.js' | |||
727 | --- www/src/js/views/snap-reviews.js 2015-04-24 23:05:53 +0000 | |||
728 | +++ www/src/js/views/snap-reviews.js 2015-05-26 20:54:26 +0000 | |||
729 | @@ -4,7 +4,7 @@ | |||
730 | 4 | var template = require('../templates/snap-reviews.hbs'); | 4 | var template = require('../templates/snap-reviews.hbs'); |
731 | 5 | 5 | ||
732 | 6 | module.exports = Backbone.Marionette.ItemView.extend({ | 6 | module.exports = Backbone.Marionette.ItemView.extend({ |
734 | 7 | 7 | className: 'b-snap__tab-content', | |
735 | 8 | template: function() { | 8 | template: function() { |
736 | 9 | return template(); | 9 | return template(); |
737 | 10 | } | 10 | } |
738 | 11 | 11 | ||
739 | === modified file 'www/src/js/views/snap-settings.js' | |||
740 | --- www/src/js/views/snap-settings.js 2015-04-11 15:14:07 +0000 | |||
741 | +++ www/src/js/views/snap-settings.js 2015-05-26 20:54:26 +0000 | |||
742 | @@ -4,6 +4,7 @@ | |||
743 | 4 | var template = require('../templates/snap-settings.hbs'); | 4 | var template = require('../templates/snap-settings.hbs'); |
744 | 5 | 5 | ||
745 | 6 | module.exports = Backbone.Marionette.ItemView.extend({ | 6 | module.exports = Backbone.Marionette.ItemView.extend({ |
746 | 7 | className: 'b-snap__tab-content', | ||
747 | 7 | template: function() { | 8 | template: function() { |
748 | 8 | return template(); | 9 | return template(); |
749 | 9 | }, | 10 | }, |
nice improvement!