Merge branch 'release/3.1.0'

Marco Solazzi · Marco Solazzi · commit fcf5b916bb5d · 2016-07-05T14:51:21.000+02:00
diff --git a/application/assets/javascripts/base/plugins.js b/application/assets/javascripts/base/plugins.js
@@ -29,15 +29,5 @@
 }());
 
 
-//Fix IE10 on WP8 visualization issues
-//see http://getbootstrap.com/getting-started/#ie-10-width
-//see http://timkadlec.com/2013/01/windows-phone-8-and-device-width/
-if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
-    var msViewportStyle = document.createElement('style');
-    msViewportStyle.appendChild(
-        document.createTextNode('@-ms-viewport{width:auto!important}')
-    );
-    document.getElementsByTagName('head')[0].appendChild(msViewportStyle);
-}
 
 // Place any jQuery/helper plugins in here.
diff --git a/application/assets/stylesheets/base/_base.scss b/application/assets/stylesheets/base/_base.scss
@@ -38,6 +38,7 @@
 *::before,
 *::after {
     box-sizing: border-box;
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }
 
 html,
diff --git a/application/assets/stylesheets/base/_globals.scss b/application/assets/stylesheets/base/_globals.scss
@@ -17,3 +17,7 @@ $layers: (
     above: 1,
     modal: 10
 );
+
+//PSD base viewport size
+$viewport-width: 1280px;
+$viewport-height: 720px;
diff --git a/application/assets/stylesheets/base/_mixins.scss b/application/assets/stylesheets/base/_mixins.scss
@@ -23,6 +23,13 @@
     @return map-get($layers, $level);
 }
 
+@function vw($width, $viewport-reference-width: $viewport-width) {
+    @return (strip-units($width) / strip-units($viewport-reference-width)) * 100 + vw;
+}
+
+@function vh($height, $viewport-reference-height: $viewport-height) {
+    @return (strip-units($height) / strip-units($viewport-reference-height)) * 100 + vh;
+}
 
 
 // Elements
@@ -179,14 +186,14 @@
         $context: $context * 1px;
     }
 
-    @return ($pixels / $context) * 1em;
+    @return #{$pixels / $context}em;
 }
 
 @function rem($pixels) {
     @if (unitless($pixels)) {
         $pixels: $pixels * 1px;
     }
-    @return ($pixels / $font-size-default) * 1rem;
+    @return #{$pixels / $font-size-default}rem;
 }
 
 
diff --git a/application/assets/stylesheets/base/_utility.scss b/application/assets/stylesheets/base/_utility.scss
@@ -203,4 +203,21 @@
 .is-invisible,
 .u-invisible { //DEPRECATED: also as global state
     visibility: hidden;
+}
+
+@each $mq-key, $mq-value in $mq-breakpoints {
+
+    @include mq($mq-key) {
+        .u-hidden--from-#{$mq-key} {
+            display: none !important;
+            visibility: hidden;
+        }
+    }
+
+    @include mq($until: $mq-key) {
+        .u-hidden--until-#{$mq-key} {
+            display: none !important;
+            visibility: hidden;
+        }
+    }
 }
diff --git a/application/views/templates/_default.nunj.html b/application/views/templates/_default.nunj.html
@@ -14,6 +14,7 @@
     <!-- mobile meta (hooray!) -->
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
+    <meta name="format-detection" content="telephone=no">
     <meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <!-- build:replace /assets/vendors/modernizr/modernizr.min.js -->
@@ -29,7 +30,7 @@
     {% endblock %}
 
 </head>
-<body class="{% if bodyClass %}{{ bodyClass }}{% endif %}">
+<body class="{{ bodyClass if bodyClass | safe }}">
 
     <h1>Hello World!</h1>
 
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "wok",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "authors": [
     "Marco Solazzi <marco.solazzi@gmail.com>",
     "Matteo Guidotto <j8.matteo@gmail.com>",
@@ -16,6 +16,6 @@
   ],
   "dependencies": {
     "sass-mq": "3.2.9",
-    "normalize-css": "4.0.0"
+    "normalize-css": "4.1.1"
   }
 }
diff --git a/build/gulp-tasks/bump.js b/build/gulp-tasks/bump.js
@@ -25,7 +25,7 @@ module.exports = function (gulp, $, options) {
             message: 'New version number?',
             default: (allowed.length - 1),
             choices: allowed.map(function (type) { return { name: type + ' (' + semver.inc(options.pkg.version, type)  + ')', value: type}; })
-        }], function (answers) {
+        }]).then(function (answers) {
             argv.type = answers.version;
             done();
         });
diff --git a/build/gulp-tasks/images.js b/build/gulp-tasks/images.js
@@ -6,42 +6,35 @@
 module.exports = function (gulp, $, options) {
 
     var path = require('path'),
-        productionPipe = $.util.noop,
         paths = options.paths,
-        filesMatch = '**/*.{png,jpg,gif,svg,webp}';
+        filesMatch = '**/*.{png,jpg,gif,svg,webp}',
+        plugins = [];
+
+    plugins.push($.imagemin.svgo({
+        plugins: [
+            {cleanupIDs: false},
+            {removeViewBox: false}
+        ]
+    }));
+
+    if (options.production) {
+        plugins.push(
+            $.imagemin.jpegtran({progressive: false}),
+            $.imagemin.gifsicle({interlaced: true}),
+            $.imagemin.optipng()
+        );
+    }
 
     gulp.task('images', function () {
 
-        if (options.production) {
-            productionPipe = require('lazypipe')()
-                .pipe($.imagemin, {
-                    progressive: false,
-                    interlaced: true,
-                    svgoPlugins: [{
-                        cleanupIDs: false,
-                        removeViewBox: false
-                    }]
-                })
-                .pipe($.rev);
-        }
-
         return gulp.src(options.assetsPath('src.images', filesMatch))
-            .pipe($.changed(options.assetsPath('dist.images')))
-            .pipe($.if('*.svg', $.imagemin({
-                svgoPlugins: [{
-                    cleanupIDs: false,
-                    removeViewBox: false
-                }]
-            })))
-            .pipe($.if(options.production, productionPipe()))
-            .pipe(
-                gulp.dest(options.assetsPath('dist.images'))
-            )
+            .pipe($.imagemin(plugins))
+            .pipe($.if(options.production, $.rev()))
+            .pipe(gulp.dest(options.assetsPath('dist.images')))
             .pipe($.if(options.production, $.rev.manifest(path.join(paths.dist.root, paths.dist.revmap), {merge: true})))
             .pipe($.if(options.production, gulp.dest('.')))
             .pipe($.if(options.isWatching, $.notify({ message: 'Images Processed', onLast: true })))
             .pipe($.size({title: 'images'}));
-
     });
 
 };
diff --git a/build/gulp-tasks/serve.js b/build/gulp-tasks/serve.js
@@ -64,11 +64,11 @@ module.exports = function (gulp, $, options) {
     }
 
     //ensure proper exit on windows
-    if (process.platform === 'win32') {
-        process.on('SIGINT', function () {
-            process.exit();
-        });
-    }
+    // if (process.platform === 'win32') {
+    process.on('SIGINT', function () {
+        process.exit();
+    });
+    // }
 
     // Watch Files For Changes & Reload
     gulp.task('serve', ['default'], function (done) {
@@ -127,13 +127,12 @@ module.exports = function (gulp, $, options) {
 
         var browserSync = require('browser-sync').create(options.buildHash),
             serverConf = _.defaults({
-                logLevel: 'silent',
                 open: false,
                 ui: false
             }, serverConfigDefault);
 
         browserSync.init(serverConf, function () {
-            $.util.log($.util.colors.green('Running a static server on port ' + ports.connect + '...'));
+            //$.util.log($.util.colors.green('Running a static server on port ' + ports.connect + '...'));
         });
 
         process.on('exit', function () {
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "wok",
   "description": "A Static Website Boilerplate",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -25,56 +25,54 @@
   "engines": {
     "node": "~0.12.7"
   },
-  "dependencies": {
-
-  },
+  "dependencies": {},
   "devDependencies": {
-    "autoprefixer": "6.3.4",
-    "browser-sync": "2.11.1",
+    "autoprefixer": "6.3.7",
+    "browser-sync": "2.13.0",
     "customizr": "https://github.com/doctyper/customizr/tarball/develop",
     "datauri": "1.0.4",
-    "del": "2.2.0",
-    "ftps": "0.4.6",
-    "glob": "7.0.3",
+    "del": "2.2.1",
+    "ftps": "0.4.7",
+    "glob": "7.0.5",
     "gulp": "3.9.1",
-    "gulp-bump": "2.0.1",
+    "gulp-bump": "2.2.0",
     "gulp-changed": "1.3.0",
     "gulp-concat": "2.6.0",
     "gulp-filter": "4.0.0",
-    "gulp-header": "1.7.1",
-    "gulp-if": "2.0.0",
-    "gulp-imagemin": "2.4.0",
-    "gulp-load-plugins": "1.2.0",
+    "gulp-header": "1.8.7",
+    "gulp-if": "2.0.1",
+    "gulp-imagemin": "3.0.1",
+    "gulp-load-plugins": "1.2.4",
     "gulp-minify-css": "1.2.4",
     "gulp-notify": "2.2.0",
     "gulp-plumber": "1.1.0",
-    "gulp-postcss": "6.1.0",
+    "gulp-postcss": "6.1.1",
     "gulp-rename": "1.2.2",
-    "gulp-rev": "7.0.0",
+    "gulp-rev": "7.1.0",
     "gulp-rev-replace": "0.4.3",
-    "gulp-sass": "2.2.0",
+    "gulp-sass": "2.3.2",
     "gulp-size": "2.1.0",
     "gulp-sourcemaps": "1.6.0",
-    "gulp-uglify": "1.5.3",
-    "gulp-useref": "3.0.8",
+    "gulp-uglify": "1.5.4",
+    "gulp-useref": "3.1.0",
     "gulp-util": "3.0.7",
-    "hasbin": "1.2.1",
-    "image-size": "0.4.0",
-    "inquirer": "0.12.0",
+    "hasbin": "1.2.3",
+    "image-size": "0.5.0",
+    "inquirer": "1.1.1",
     "lazypipe": "1.0.1",
-    "lodash": "4.6.1",
+    "lodash": "4.13.1",
     "lorem-ipsum": "1.0.3",
     "marked": "0.3.5",
     "mkdirp": "0.5.1",
     "modernizr": "3.3.1",
-    "node-sass": "3.4.2",
-    "nunjucks": "2.4.1",
+    "node-sass": "3.8.0",
+    "nunjucks": "2.4.2",
     "nunjucks-markdown": "2.0.0",
-    "rsyncwrapper": "1.0.0",
-    "run-sequence": "1.1.5",
+    "rsyncwrapper": "1.0.1",
+    "run-sequence": "1.2.2",
+    "semver": "5.2.0",
     "ssh2": "0.5.0",
-    "semver": "5.1.0",
     "through2": "2.0.1",
-    "yargs": "4.3.2"
+    "yargs": "4.7.1"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@`
`38`	`38`	`*::before,`
`39`	`39`	`*::after {`
`40`	`40`	`box-sizing: border-box;`
	`41`	`+ -webkit-tap-highlight-color: rgba(0, 0, 0, 0);`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`html,`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,13 @@`
`23`	`23`	`@return map-get($layers, $level);`
`24`	`24`	`}`
`25`	`25`
	`26`	`+@function vw($width, $viewport-reference-width: $viewport-width) {`
	`27`	`+ @return (strip-units($width) / strip-units($viewport-reference-width)) * 100 + vw;`
	`28`	`+}`
	`29`	`+`
	`30`	`+@function vh($height, $viewport-reference-height: $viewport-height) {`
	`31`	`+ @return (strip-units($height) / strip-units($viewport-reference-height)) * 100 + vh;`
	`32`	`+}`
`26`	`33`
`27`	`34`
`28`	`35`	`// Elements`
`@@ -179,14 +186,14 @@`
`179`	`186`	`$context: $context * 1px;`
`180`	`187`	`}`
`181`	`188`
`182`		`- @return ($pixels / $context) * 1em;`
	`189`	`+ @return #{$pixels / $context}em;`
`183`	`190`	`}`
`184`	`191`
`185`	`192`	`@function rem($pixels) {`
`186`	`193`	`@if (unitless($pixels)) {`
`187`	`194`	`$pixels: $pixels * 1px;`
`188`	`195`	`}`
`189`		`- @return ($pixels / $font-size-default) * 1rem;`
	`196`	`+ @return #{$pixels / $font-size-default}rem;`
`190`	`197`	`}`
`191`	`198`
`192`	`199`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "wok",`
`3`		`- "version": "3.0.0",`
	`3`	`+ "version": "3.1.0",`
`4`	`4`	`"authors": [`
`5`	`5`	`"Marco Solazzi <[email protected]>",`
`6`	`6`	`"Matteo Guidotto <[email protected]>",`
`@@ -16,6 +16,6 @@`
`16`	`16`	`],`
`17`	`17`	`"dependencies": {`
`18`	`18`	`"sass-mq": "3.2.9",`
`19`		`- "normalize-css": "4.0.0"`
	`19`	`+ "normalize-css": "4.1.1"`
`20`	`20`	`}`
`21`	`21`	`}`