Merge branch 'release-0.2.1'

Author: thingsym

.travis.yml

@@ -1,5 +1,5 @@
-sudo: false
-dist: trusty
+os: linux
+dist: xenial
 
 language: node_js
 
@@ -19,3 +19,12 @@ install:
 
 script:
   - npm test
+
+deploy:
+  provider: npm
+  email: $NPM_EMAIL
+  api_key: $NPM_TOKEN
+  on:
+    branch: master
+    tags: true
+    condition: $TRAVIS_TAG =~ ^v[0-9]+\.[0-9]+\.[0-9]+$

README.md

@@ -44,24 +44,35 @@ $default-grid-gutter: 2%;
 
 ```
 .grid {
+  -webkit-box-sizing: border-box;
   box-sizing: border-box;
+  display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
-  margin: 0 -1%;
+  margin-left: -1%;
+  margin-right: -1%;
 }
 
 .grid > .grid__col-3 {
+  -webkit-box-sizing: border-box;
   box-sizing: border-box;
+  -webkit-box-flex: 0;
   -ms-flex: 0 0 23%;
   flex: 0 0 23%;
-  margin: 0 1% 2%;
+  margin-left: 1%;
+  margin-right: 1%;
+  margin-bottom: 2%;
 }
 
 .grid > .grid__col-9 {
+  -webkit-box-sizing: border-box;
   box-sizing: border-box;
+  -webkit-box-flex: 0;
   -ms-flex: 0 0 73%;
   flex: 0 0 73%;
-  margin: 0 1% 2%;
+  margin-left: 1%;
+  margin-right: 1%;
+  margin-bottom: 2%;
 }
 ```
 
@@ -120,13 +131,9 @@ Example : import form node_modules
 
 See Flexbox Grid Mixins documentation: [http://thingsym.github.io/flexbox-grid-mixins/](http://thingsym.github.io/flexbox-grid-mixins/)
 
-## Package manager
-
-[flexbox-grid-mixins - npm](https://www.npmjs.com/package/flexbox-grid-mixins)
-
 ## Mixins Reference
 
-* [Mixins Reference](http://thingsym.github.io/flexbox-grid-mixins/#Mixins-Reference)
+[Mixins Reference](http://thingsym.github.io/flexbox-grid-mixins/#Mixins-Reference)
 
 ## Example
 
@@ -141,7 +148,11 @@ See Flexbox Grid Mixins documentation: [http://thingsym.github.io/flexbox-grid-m
 * [Grid Type](http://thingsym.github.io/flexbox-grid-mixins/example/grid-type.html)
 * [Testing Stick Out Grid](http://thingsym.github.io/flexbox-grid-mixins/example/test-stick-out.html)
 
-### Development
+## Package manager
+
+[flexbox-grid-mixins - npm](https://www.npmjs.com/package/flexbox-grid-mixins)
+
+## Development
 
 1. run ```$ sudo yum install nodejs npm```
 2. run ```$ sudo npm install --global gulp-cli```
@@ -166,6 +177,9 @@ Small patches and bug reports can be submitted a issue tracker in Github. Forkin
 
 ## Changelog
 
+* Version 0.2.1
+  * auto release to npm only version tags
+  * gulp bump up version to 4.0
 * Version 0.2.0
   * update example
   * update package.json

gulpfile.js

@@ -1,27 +1,24 @@
 'use strict';
 
-var gulp = require('gulp');
-var $ = require('gulp-load-plugins')();
+const gulp = require('gulp');
+const $ = require('gulp-load-plugins')();
 
 require('es6-promise').polyfill();
 
-var runSequence = require('run-sequence');
+const browserSync = require('browser-sync').create();
 
-var browserSync = require('browser-sync').create();
-var reload = browserSync.reload;
-
-var src_paths = {
+const src_paths = {
   sass: ['sass/_flexbox-grid-mixins.scss'],
   docs_sass: ['docs/sass/*.scss'],
   docs_static: ['docs/*.html', 'docs/**/*.html']
 };
 
-var dest_paths = {
+const dest_paths = {
   browserSync: 'docs',
   docs_css: 'docs/css/'
 };
 
-gulp.task('lint:sass', function() {
+function lint_sass() {
   return gulp.src(src_paths.sass)
     .pipe($.plumber({
       errorHandler: function(err) {
@@ -46,9 +43,9 @@ gulp.task('lint:sass', function() {
         console: true
       }]
     }));
-});
+};
 
-gulp.task('docs_sass', function() {
+function docs_sass() {
   return gulp.src(src_paths.docs_sass)
     .pipe($.plumber({
       errorHandler: function(err) {
@@ -64,32 +61,30 @@ gulp.task('docs_sass', function() {
     }))
     .pipe(gulp.dest(dest_paths.docs_css))
     .pipe(browserSync.stream());
-});
+}
 
-gulp.task('browser-sync', function() {
+function browser_sync(done) {
   browserSync.init({
     server: {
       baseDir: dest_paths.browserSync
-    }
+    },
+    reloadOnRestart: true
   });
+  done();
+}
 
-  gulp.watch(src_paths.sass, ['default']).on('change', reload);
-  gulp.watch(src_paths.docs_sass, ['docs_sass']);
-  gulp.watch(src_paths.docs_static).on('change', reload);
-});
-
-gulp.task('lint', ['lint:sass']);
-gulp.task('serve', ['browser-sync']);
+function watch_files(done) {
+  const browserReload = () => {
+    browserSync.reload();
+    done();
+  };
 
-gulp.task('default', function(callback) {
-  runSequence(
-    'lint',
-    'docs_sass',
-    callback
-  );
-});
+  gulp.watch(src_paths.sass).on('change', gulp.series(lint_sass, docs_sass, browserReload));
+  gulp.watch(src_paths.docs_sass).on('change', gulp.series(lint_sass, docs_sass, browserReload));
+  gulp.watch(src_paths.docs_static).on('change', browserReload);
+}
 
-gulp.task('watch', function() {
-  gulp.watch(src_paths.sass, ['default']);
-  gulp.watch(src_paths.docs_sass, ['docs_sass']);
-});
+exports.docs_sass = docs_sass;
+exports.lint = lint_sass;
+exports.serve = gulp.series(browser_sync, watch_files);
+exports.default = gulp.series(lint_sass, docs_sass);