Merge lp:~stephen-stewart/snapweb/icons-icons-icons into lp:~snappy-dev/snapweb/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
Reviewer Review Type Date Requested Status
Sergio Schvezov Approve
Review via email: mp+259800@code.launchpad.net

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

To post a comment you must log in.
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

nice improvement!

review: Approve

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 var buffer = require('vinyl-buffer');
6 var concat = require('gulp-concat');
7 var csso = require('gulp-csso');
8+var customMedia = require('postcss-custom-media');
9 var del = require('del');
10 var gulp = require('gulp');
11 var gutil = require('gulp-util');
12@@ -47,7 +48,7 @@
13 }
14
15 return bundleShared(bundler);
16-}
17+}
18
19 function bundleShared(bundler) {
20 return bundler.bundle()
21@@ -72,11 +73,33 @@
22
23 // Styles
24
25+
26 gulp.task('styles', ['styles:clean'], function() {
27 var processors = [
28 autoprefixer({browsers: ['last 1 version']}),
29- bemlinter('bem')
30+ bemlinter('bem'),
31+ customMedia({
32+ extensions: {
33+ '--xxs': '(min-width: ' + calcWidth(4,8) + 'px)',
34+ '--xs': '(min-width: ' + calcWidth(5,9) + 'px)',
35+ '--s': '(min-width: ' + calcWidth(6,10) + 'px)',
36+ '--m': '(min-width: ' + calcWidth(7) + 'px)',
37+ '--l': '(min-width: ' + calcWidth(9) + 'px)',
38+ '--xl': '(min-width: ' + calcWidth(11) + 'px)',
39+ '--xxl': '(min-width: ' + calcWidth(13) + 'px)',
40+ '--xxxl': '(min-width: ' + calcWidth(15) + 'px)'
41+ }
42+ })
43 ];
44+
45+ function calcWidth(units, padding, width) {
46+ var scrollbar = 17;
47+ width = width || 90; // width of an icon in grid style
48+ padding = padding || 10;
49+
50+ return (((width + (padding*2)) * units) + (scrollbar * 2));
51+ }
52+
53 return gulp.src([
54 'node_modules/normalize.css/normalize.css',
55 'www/src/css/**/*.css'
56
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 "lodash": "~3.3.1",
62 "normalize.css": "^3.0.3",
63 "postcss-bem-linter": "git://github.com/necolas/postcss-bem-linter",
64+ "postcss-custom-media": "^3.0.0",
65 "pretty-bytes": "^1.0.4",
66 "vinyl-buffer": "~1.0.0",
67 "vinyl-source-stream": "~1.1.0",
68
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+@keyframes rotate {
74+ from { transform: rotate(0deg) }
75+ to { transform: rotate(360deg) }
76+}
77
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 /** @define b-banner; weak */
83
84 .b-banner {
85- display:flex;
86- align-items:center;
87- background-color:#202020;
88+ background-color:#2f2f2f;
89 color:#efefef;
90 line-height:20px;
91 }
92+.b-banner .b-layout__container {
93+ display:flex;
94+ align-items:center;
95+}
96
97 .b-banner img {
98 display:block;
99
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 }
105
106 body {
107- background: url('../images/image-background-paper.png') repeat-y fixed 50% 0 #f7f7f7;
108+ background-color:#f7f7f7;
109 }
110
111 a {
112
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+/** @define b-headline; weak */
118+
119+.b-headline {
120+}
121+
122+.b-headline__h1 {
123+ font-size:18px;
124+ font-weight:400;
125+ margin:20px 15px 5px 15px;
126+}
127
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+.b-icon {
133+ position:relative;
134+ display:inline-block;
135+}
136+
137+.b-icon::before {
138+ content: "";
139+ position:absolute;
140+ top:0;
141+ left:0;
142+ right:0;
143+ bottom:0;
144+ background-color:transparent;
145+ background-image:url(/public/images/icon-mask.png);
146+ background-repeat:no-repeat;
147+ background-position:50% 50%;
148+ background-size:100% 100%;
149+}
150+
151+.b-icon img {
152+ display:block;
153+}
154
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
160 .b-layout__main {
161 flex: 1;
162- padding:0 3em;
163+ position:relative;
164 }
165
166-.b-layout__main:empty {
167- opacity:0.5;
168- background:transparent url("/public/images/default-package-icon.svg") 50% 50% no-repeat;
169+.b-layout__main:empty::before {
170+ content:"";
171+ position:absolute;
172+ top:50%;
173+ left:50%;
174+ width:128px;
175+ height:128px;
176+ margin:-64px 0 0 -64px;
177+ background:transparent url("/public/images/cof.svg") 50% 50% no-repeat;
178+ background-size: 100% 100%;
179+ animation: rotate 3s linear infinite;
180 }
181
182 .b-layout__main:empty + .b-layout__footer {
183@@ -36,3 +44,56 @@
184 width: 100%;
185 z-index: 10000;
186 }
187+
188+.b-layout__container {
189+ width:312px;
190+ margin:0 auto;
191+}
192+
193+@media (--xxs) {
194+.b-layout__container {
195+ width: 424px;
196+ }
197+}
198+
199+@media (--xs) {
200+.b-layout__container {
201+ width: 540px;
202+ }
203+}
204+
205+@media (--s) {
206+.b-layout__container {
207+ width: 660px;
208+ }
209+}
210+
211+@media (--m) {
212+.b-layout__container {
213+ width: 770px;
214+ }
215+}
216+
217+@media (--l) {
218+.b-layout__container {
219+ width: 990px;
220+ }
221+}
222+
223+@media (--xl) {
224+.b-layout__container {
225+ width: 1210px;
226+ }
227+}
228+
229+@media (--xxl) {
230+.b-layout__container {
231+ width: 1430px;
232+ }
233+}
234+
235+@media (--xxxl) {
236+.b-layout__container {
237+ width: 1650px;
238+ }
239+}
240
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 .b-snap {
246 }
247
248-.b-snap__icon {
249-}
250-.b-snap__icon img {
251- display:block;
252+.b-snap .b-icon {
253 }
254
255 .b-snap__banner {
256 display: flex;
257 line-height:1.3;
258- margin:0 -3em;
259- padding:1.3em 3em 1.3em;
260+ padding:1.3em 0;
261 align-items: flex-start;
262- background-color:rgba(255,255,255,0.7);
263 }
264
265 .b-snap__meta {
266 flex: 2;
267+ margin-left:15px;
268 }
269
270 .b-snap__meta > * {
271@@ -36,13 +32,14 @@
272
273 .b-snap__navigation {
274 background-color:rgba(255,255,255,0.5);
275- display: flex;
276- align-items: center;
277- margin:0 0 1em 0;
278 border-top:1px solid #efefef;
279 border-bottom:1px solid #ddd;
280- margin:0 -3em 1em -3em;
281- padding:0 3em;
282+ margin:0 0 1em 0;
283+}
284+
285+.b-snap__navigation .b-layout__container {
286+ display: flex;
287+ align-items: center;
288 }
289
290 .b-snap__nav-item {
291@@ -64,3 +61,7 @@
292 right:0;
293 height:3px;
294 }
295+
296+.b-snap__tab-content {
297+ padding:1.3em 3em 1.3em;
298+}
299
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
305 .b-snaplist__item {
306 cursor: pointer;
307+ font-size:0;
308 }
309
310+
311 /** grid style **/
312
313 .b-snaplist_grid {
314@@ -15,16 +17,8 @@
315 }
316
317 .b-snaplist_grid .b-snaplist__item {
318- flex: 0 1 20%;
319- padding:10px;
320-}
321-
322-.b-snaplist_grid .b-snaplist__icon {
323-}
324-
325-.b-snaplist_grid .b-snaplist__icon img {
326- border-radius:15%;
327- width:100%;
328+ flex: 0 1 auto;
329+ padding:7px;
330 }
331
332 .b-snaplist_grid .b-snaplist__name {
333@@ -32,14 +26,44 @@
334 white-space: nowrap;
335 overflow: hidden;
336 text-overflow: ellipsis;
337+ font-size:12px;
338+ color:#999;
339+ margin-top:4px;
340+}
341+
342+.b-snaplist_grid .b-snaplist__name,
343+.b-snaplist_grid .b-icon img {
344+ width:90px;
345 }
346
347 .b-snaplist_grid .b-snaplist__name ~ * {
348 display:none;
349 }
350
351+@media (--xxs) {
352+ .b-snaplist_grid .b-snaplist__item {
353+ padding:8px;
354+ }
355+}
356+
357+@media (--xs) {
358+ .b-snaplist_grid .b-snaplist__item {
359+ padding:9px;
360+ }
361+}
362+
363+@media (--s) {
364+ .b-snaplist_grid .b-snaplist__item {
365+ padding:10px;
366+ }
367+}
368+
369 /** row style **/
370
371+.b-snaplist_row {
372+ margin:3em;
373+}
374+
375 .b-snaplist_row .b-snaplist__item {
376 width:100%;
377 display:flex;
378@@ -48,17 +72,23 @@
379 border-radius:4px;
380 margin-bottom:0.6em;
381 background-color:#fff;
382+ font-size:13px;
383 }
384
385 .b-snaplist_row .b-snaplist__item:last-child {
386 margin-bottom:0;
387 }
388
389-.b-snaplist_row .b-snaplist__icon {
390+
391+.b-snaplist_row .b-icon {
392 flex:0 0 40px;
393 }
394
395-.b-snaplist_row .b-snaplist__icon img {
396+.b-snaplist_row .b-icon::before {
397+ background-image: url(/public/images/icon-mask-on-white.png);
398+}
399+
400+.b-snaplist_row .b-icon img {
401 display:block;
402 width: 40px;
403 height: 40px;
404
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 <?xml version="1.0" encoding="utf-8"?>
410-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
411-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
412- <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
413-]>
414-<svg version="1.1"
415- xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
416- x="0px" y="0px" width="285px" height="285px" viewBox="-0.866 -0.866 285 285" enable-background="new -0.866 -0.866 285 285"
417- xml:space="preserve">
418-<defs>
419-</defs>
420-<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
421- S283.465,63.455,283.465,141.734z"/>
422-<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
423- 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
424- 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- 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- 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- 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- 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- 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- 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- 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- 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- 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- 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"/>
435+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
436+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
437+<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+ width="256px" height="256px" viewBox="0 0 256 256" enable-background="new 0 0 256 256" xml:space="preserve">
439+<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+ 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+ 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+ 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+ 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+ 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+ 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+ 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+ 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+ 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"/>
449 </svg>
450
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 <?xml version="1.0" encoding="utf-8"?>
456 <!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
457 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
458-<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"
459- width="256px" height="256px" viewBox="0 0 256 256" enable-background="new 0 0 256 256" xml:space="preserve">
460-<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
461- 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
462- 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
463- 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
464- 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
465- 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
466- 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
467- 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
468- 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
469- L149.6,126z"/>
470+<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+ height="256px" viewBox="0 0 256 256" enable-background="new 0 0 256 256" xml:space="preserve">
472+<g id="Layer_1">
473+ <rect fill="#EFEFEF" width="256" height="256"/>
474+</g>
475+<g id="Layer_2">
476+ <line fill="none" stroke="#DBDBDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="256"/>
477+ <line fill="none" stroke="#DBDBDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="256"/>
478+ <line fill="none" stroke="#C1C1C1" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="256"/>
479+ <line fill="#EFEFEF" stroke="#AAAAAA" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="256"/>
480+ <line fill="none" stroke="#DBDBDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="256"/>
481+ <line fill="none" stroke="#C1C1C1" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="256"/>
482+ <line fill="none" stroke="#DBDBDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="256"/>
483+ <line fill="none" stroke="#DBDBDB" stroke-miterlimit="10" x1="0" y1="224" x2="256" y2="224"/>
484+ <line fill="none" stroke="#DBDBDB" stroke-miterlimit="10" x1="0" y1="160" x2="256" y2="160"/>
485+ <line fill="none" stroke="#C1C1C1" stroke-miterlimit="10" x1="0" y1="192" x2="256" y2="192"/>
486+ <line fill="#EFEFEF" stroke="#AAAAAA" stroke-miterlimit="10" x1="0" y1="128" x2="256" y2="128"/>
487+ <line fill="none" stroke="#DBDBDB" stroke-miterlimit="10" x1="0" y1="96" x2="256" y2="96"/>
488+ <line fill="none" stroke="#C1C1C1" stroke-miterlimit="10" x1="0" y1="64" x2="256" y2="64"/>
489+ <line fill="none" stroke="#DBDBDB" stroke-miterlimit="10" x1="0" y1="32" x2="256" y2="32"/>
490+</g>
491+<g id="Layer_3">
492+ <circle fill="#EFEFEF" cx="128" cy="128" r="64"/>
493+ <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+ 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+ 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+ 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+ 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+ 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+ 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+ 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+ 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+ 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+</g>
504 </svg>
505
506=== added file 'www/src/images/icon-mask-on-white.png'
507Binary 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'
509Binary 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 if (response.hasOwnProperty('download_size')) {
515 this.set(
516 //jscs:disable requireCamelCaseOrUpperCaseIdentifiers
517- 'prettyDownloadSize', this.prettifyBytes(Number(response.download_size))
518+ 'prettyDownloadSize',
519+ this.prettifyBytes(Number(response.download_size))
520 );
521 }
522
523 if (response.hasOwnProperty('installed_size')) {
524 this.set(
525 //jscs:disable requireCamelCaseOrUpperCaseIdentifiers
526- 'prettyInstalledSize', this.prettifyBytes(Number(response.installed_size))
527+ 'prettyInstalledSize',
528+ this.prettifyBytes(Number(response.installed_size))
529 );
530 }
531
532
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 @@
537-<h1>Installed apps</h1>
538+<div class="b-headline">
539+ <div class="b-layout__container">
540+ <h1 class="b-headline__h1">Installed snaps</h1>
541+ </div>
542+</div>
543 <div class="region-installed"></div>
544
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 @@
549-<div class="b-banner__brand">
550- <div class="b-banner__nav-item{{#if isHomeActive }} b-banner__nav-item_active{{/if}}">
551- <a href="/">
552- <img src="/public/images/cof.svg" height="30" width="30">
553- <span>{{ name }} {{ subname }}</span>
554- </a>
555- </div>
556-</div>
557-<div class="b-banner__primary-nav">
558- <div class="b-banner__nav-item{{#if isStoreActive }} b-banner__nav-item_active{{/if}}">
559- <a href="/store">
560- Snappy store
561- </a>
562- </div>
563-</div>
564-<!--
565-<div class="b-banner__search">
566- <form class="b-banner__form" action="/search" method="GET">
567- <input class="b-banner__input" type="search" name="q" placeholder="Search for snaps" value="{{ query }}">
568- <div class="b-banner__nav-item{{#if isSearchActive }} b-banner__nav-item_active{{/if}}">
569- <button type="submit" class="b-banner__submit"></button>
570- </div>
571- </form>
572-</div>
573-<div class="b-banner__secondary-nav">
574- <div class="b-banner__nav-item{{#if isSystemActive }} b-banner__nav-item_active{{/if}}">
575- <a href="/system-settings">
576- <img src="/public/images/settings.svg" height="30" width="30">
577- </a>
578- </div>
579-</div>
580--->
581+<div class="b-layout__container">
582+ <div class="b-banner__brand">
583+ <div class="b-banner__nav-item{{#if isHomeActive }} b-banner__nav-item_active{{/if}}">
584+ <a href="/">
585+ <img src="/public/images/cof.svg" height="30" width="30">
586+ <span>{{ name }} {{ subname }}</span>
587+ </a>
588+ </div>
589+ </div>
590+ <div class="b-banner__primary-nav">
591+ <div class="b-banner__nav-item{{#if isStoreActive }} b-banner__nav-item_active{{/if}}">
592+ <a href="/store">
593+ Snappy store
594+ </a>
595+ </div>
596+ </div>
597+ <!--
598+ <div class="b-banner__search">
599+ <form class="b-banner__form" action="/search" method="GET">
600+ <input class="b-banner__input" type="search" name="q" placeholder="Search for snaps" value="{{ query }}">
601+ <div class="b-banner__nav-item{{#if isSearchActive }} b-banner__nav-item_active{{/if}}">
602+ <button type="submit" class="b-banner__submit"></button>
603+ </div>
604+ </form>
605+ </div>
606+ <div class="b-banner__secondary-nav">
607+ <div class="b-banner__nav-item{{#if isSystemActive }} b-banner__nav-item_active{{/if}}">
608+ <a href="/system-settings">
609+ <img src="/public/images/settings.svg" height="30" width="30">
610+ </a>
611+ </div>
612+ </div>
613+ -->
614+</div>
615
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-<div class="b-snap__icon">
621- <img src="{{ icon }}" width="256" height="256">
622-</div>
623
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 @@
628-<div class="b-snap__banner">
629- <div class="b-snap__meta">
630- <h1 class="b-snap__title">{{ name }} {{ version }} {{ binary_filesize }}</h1>
631- <p>
632- <span class="b-snap__origin" title="Origin">{{ origin }}</span>
633- <span class="b-snap__filesize" title="Package filesize">{{ binary_filesize}}</span>
634- </p>
635- </div>
636- <div class="b-snap__actions">
637- {{> installer}}
638+<div class="b-layout__container">
639+ <div class="b-snap__banner">
640+ <div class="b-icon">
641+ <img src="{{ icon }}" width="70" height="70">
642+ </div>
643+ <div class="b-snap__meta">
644+ <h1 class="b-snap__title">{{ name }} {{ version }} {{ binary_filesize }}</h1>
645+ <p>
646+ <span title="Vendor">{{ vendor }}</span>
647+ <span>{{ binary_filesize}}</span>
648+ </p>
649+ </div>
650+ <div class="b-snap__actions">
651+ {{> installer}}
652+ </div>
653 </div>
654 </div>
655 <div class="region-menu"></div>
656
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 @@
661-<a class="b-snap__nav-item" href="details">
662- Details
663-</a>
664-<a class="b-snap__nav-item" href="reviews">
665- Reviews
666-</a>
667-<a class="b-snap__nav-item" href="settings">
668- Settings
669-</a>
670+<div class="b-layout__container">
671+ <a class="b-snap__nav-item" href="details">
672+ Details
673+ </a>
674+ <a class="b-snap__nav-item" href="reviews">
675+ Reviews
676+ </a>
677+ <a class="b-snap__nav-item" href="settings">
678+ Settings
679+ </a>
680+</div>
681
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 @@
686-<div class="b-snaplist__icon">
687- <img src="{{ icon }}" alt="{{ name }} icon">
688+<div class="b-icon">
689+ <img src="{{ icon }}" width="90" height="90">
690 </div>
691 <div class="b-snaplist__name">{{ name }}</div>
692 {{!-- only name is shown in grid view, everything after is hidden --}}
693
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-<h1>Store Snaps</h1>
699 <div class="region-product"></div>
700
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
706 module.exports = Backbone.Marionette.LayoutView.extend({
707
708+ className: 'b-layout__container',
709+
710 template : function() {
711 return template();
712 },
713
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 var template = require('../templates/snap-detail.hbs');
719
720 module.exports = Backbone.Marionette.ItemView.extend({
721+ className: 'b-snap__tab-content',
722 template: function(model) {
723 return template(model);
724 },
725
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 var template = require('../templates/snap-reviews.hbs');
731
732 module.exports = Backbone.Marionette.ItemView.extend({
733-
734+ className: 'b-snap__tab-content',
735 template: function() {
736 return template();
737 }
738
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 var template = require('../templates/snap-settings.hbs');
744
745 module.exports = Backbone.Marionette.ItemView.extend({
746+ className: 'b-snap__tab-content',
747 template: function() {
748 return template();
749 },

Subscribers

People subscribed via source and target branches