Merge branch 'release-0.1.5'

Author: thingsym

README.md

@@ -145,12 +145,13 @@ See Flexbox Grid Mixins documentation: [http://thingsym.github.io/flexbox-grid-m
 
 1. run ```$ sudo yum install nodejs npm```
 2. run ```$ sudo npm install --global gulp-cli```
-3. Forking on GitHub
-4. run ```$ cd /path/to/flexbox-grid-mixins```
-5. run ```$ npm install```
-6. run ```$ bundle install --path vendor/bundle```
-7. run ```$ gulp serve```
-8. Access URL http://localhost:3000
+3. run ```$ sudo npm install --global npm-check-updates``` (optional)
+4. Forking on GitHub
+5. run ```$ cd /path/to/flexbox-grid-mixins```
+6. run ```$ npm install```
+7. run ```$ bundle install --path vendor/bundle```
+8. run ```$ gulp serve```
+9. Access URL http://localhost:3000
 
 ## Contribution
 
@@ -166,6 +167,9 @@ Small patches and bug reports can be submitted a issue tracker in Github. Forkin
 
 ## Changelog
 
+* Version 0.1.5
+  * update package.json
+  * add optional arguments $shorthand
 * Version 0.1.4
   * update example
   * update document

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "flexbox-grid-mixins",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "homepage": "https://github.com/thingsym/flexbox-grid-mixins",
   "author": "Thingsym",
   "description": "Sass Mixins to generate Flexbox grid",

docs/css/default.css

@@ -9,11 +9,16 @@ body {
   text-align: center;
   padding: 1em;
   min-height: 320px;
+  -webkit-box-sizing: border-box;
   box-sizing: border-box;
+  display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
   -ms-flex-flow: column nowrap;
   flex-flow: column nowrap;
+  -webkit-box-pack: center;
   -ms-flex-pack: center;
   justify-content: center;
 }
@@ -146,91 +151,117 @@ td.example {
 }
 
 .grid {
+  -webkit-box-sizing: border-box;
   box-sizing: border-box;
+  display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
   margin: 0 -1%;
 }
 
 .grid > .grid__col-1 {
+  -webkit-box-sizing: border-box;
   box-sizing: border-box;
+  -webkit-box-flex: 0;
   -ms-flex: 0 0 6.33333%;
   flex: 0 0 6.33333%;
   margin: 0 1% 2%;
 }
 
 .grid > .grid__col-2 {
+  -webkit-box-sizing: border-box;
   box-sizing: border-box;
+  -webkit-box-flex: 0;
   -ms-flex: 0 0 14.66667%;
   flex: 0 0 14.66667%;
   margin: 0 1% 2%;
 }
 
 .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%;
 }
 
 .grid > .grid__col-4 {
+  -webkit-box-sizing: border-box;
   box-sizing: border-box;
+  -webkit-box-flex: 0;
   -ms-flex: 0 0 31.33333%;
   flex: 0 0 31.33333%;
   margin: 0 1% 2%;
 }
 
 .grid > .grid__col-5 {
+  -webkit-box-sizing: border-box;
   box-sizing: border-box;
+  -webkit-box-flex: 0;
   -ms-flex: 0 0 39.66667%;
   flex: 0 0 39.66667%;
   margin: 0 1% 2%;
 }
 
 .grid > .grid__col-6 {
+  -webkit-box-sizing: border-box;
   box-sizing: border-box;
+  -webkit-box-flex: 0;
   -ms-flex: 0 0 48%;
   flex: 0 0 48%;
   margin: 0 1% 2%;
 }
 
 .grid > .grid__col-7 {
+  -webkit-box-sizing: border-box;
   box-sizing: border-box;
+  -webkit-box-flex: 0;
   -ms-flex: 0 0 56.33333%;
   flex: 0 0 56.33333%;
   margin: 0 1% 2%;
 }
 
 .grid > .grid__col-8 {
+  -webkit-box-sizing: border-box;
   box-sizing: border-box;
+  -webkit-box-flex: 0;
   -ms-flex: 0 0 64.66667%;
   flex: 0 0 64.66667%;
   margin: 0 1% 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%;
 }
 
 .grid > .grid__col-10 {
+  -webkit-box-sizing: border-box;
   box-sizing: border-box;
+  -webkit-box-flex: 0;
   -ms-flex: 0 0 81.33333%;
   flex: 0 0 81.33333%;
   margin: 0 1% 2%;
 }
 
 .grid > .grid__col-11 {
+  -webkit-box-sizing: border-box;
   box-sizing: border-box;
+  -webkit-box-flex: 0;
   -ms-flex: 0 0 89.66667%;
   flex: 0 0 89.66667%;
   margin: 0 1% 2%;
 }
 
 .grid > .grid__col-12 {
+  -webkit-box-sizing: border-box;
   box-sizing: border-box;
+  -webkit-box-flex: 0;
   -ms-flex: 0 0 98%;
   flex: 0 0 98%;
   margin: 0 1% 2%;