Merge branch 'release-0.2.0' into develop

thingsym · thingsym · commit cf7c4a7720a3 · 2019-12-25T16:25:14.000+09:00
diff --git a/README.md b/README.md
@@ -124,16 +124,22 @@ See Flexbox Grid Mixins documentation: [http://thingsym.github.io/flexbox-grid-m
 
 [flexbox-grid-mixins - npm](https://www.npmjs.com/package/flexbox-grid-mixins)
 
-### Mixins Reference and Example
+## Mixins Reference
 
 * [Mixins Reference](http://thingsym.github.io/flexbox-grid-mixins/#Mixins-Reference)
+
+## Example
+
 * [Basic Example](http://thingsym.github.io/flexbox-grid-mixins/#Basic-Example)
 * [Grid System Example](http://thingsym.github.io/flexbox-grid-mixins/#Grid-System-Example)
 * [Flexbox Grid Mixins Example](http://thingsym.github.io/flexbox-grid-mixins/example/example.html)
 * [Holy Grail Layout - Using Flexbox Grid Mixins](http://thingsym.github.io/flexbox-grid-mixins/example/holy-grail-layout.html)
 * [Responsive web design - Using Flexbox Grid Mixins](http://thingsym.github.io/flexbox-grid-mixins/example/responsive.html)
 * [Unit-Set Grid (Experimental stage)](http://thingsym.github.io/flexbox-grid-mixins/example/unit-set.html)
+* [Box Sizing using Variable Defaults](http://thingsym.github.io/flexbox-grid-mixins/example/box-sizing.html)
+* [Stack](http://thingsym.github.io/flexbox-grid-mixins/example/stack.html)
 * [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
 
@@ -160,6 +166,16 @@ Small patches and bug reports can be submitted a issue tracker in Github. Forkin
 
 ## Changelog
 
+* Version 0.2.0
+  * update example
+  * update package.json
+  * add Variable Defaults flexbox-grid-mixins-stack
+  * change margin property, remove @mixin, grid-margin and grid-col-margin
+  * remove breakpoint value of col argument
+  * remove condensed argument
+  * change grid-type from argument to Variable Defaults flexbox-grid-mixins-grid-type
+  * remove bower.json
+  * add .travis.yml
 * Version 0.1.6
   * add Variable Defaults $flexbox-grid-mixins-box-sizing
   * update package.json
@@ -199,4 +215,4 @@ Licensed under the MIT License.
 
 [thingsym](https://github.com/thingsym)
 
-Copyright (c) 2016 thingsym
+Copyright (c) 2016-2020 thingsym
diff --git a/docs/index.html b/docs/index.html
@@ -8,7 +8,7 @@
 </head>
 <body>
 <div class="header header--hero">
-<h1 class="header-title">Flexbox Grid Mixins <span class="version">v.0.1.6</span></h1>
+<h1 class="header-title">Flexbox Grid Mixins <span class="version">v.0.2.0</span></h1>
 <p class="header-description">Sass Mixins to generate Flexbox grid</p>
 
 <ul class="header-nav">
@@ -730,7 +730,7 @@ <h2 id="License">License</h2>
 
 <p>The MIT License (MIT)</p>
 
-<p>Copyright (c) 2016 - 2018 Thingsym</p>
+<p>Copyright (c) 2016 - 2020 Thingsym</p>
 
 </div>
 </body>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "flexbox-grid-mixins",
-  "version": "0.1.6",
+  "version": "0.2.0",
   "description": "Sass Mixins to generate Flexbox grid",
   "main": "sass/_flexbox-grid-mixins.scss",
   "author": "Thingsym",
diff --git a/sass/_flexbox-grid-mixins.scss b/sass/_flexbox-grid-mixins.scss
@@ -1,6 +1,6 @@
 // ===================================================================
 // Flexbox Grid Mixins
-// Version 0.1.6
+// Version 0.2.0
 // Description: Sass Mixins to generate Flexbox grid
 // Author: thingsym
 // GitHub: https://github.com/thingsym/flexbox-grid-mixins

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "flexbox-grid-mixins",`
`3`		`- "version": "0.1.6",`
	`3`	`+ "version": "0.2.0",`
`4`	`4`	`"description": "Sass Mixins to generate Flexbox grid",`
`5`	`5`	`"main": "sass/_flexbox-grid-mixins.scss",`
`6`	`6`	`"author": "Thingsym",`