Skip to content

Commit 900a8fa

Browse files
committed
Merge branch 'release-0.2.0'
2 parents ee49745 + dbf9adf commit 900a8fa

33 files changed

+3458
-2158
lines changed

README.md

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,6 @@ $ npm install flexbox-grid-mixins --save-dev
7979
$ yarn add flexbox-grid-mixins --dev
8080
```
8181

82-
### Bower (deprecated)
83-
84-
```
85-
$ bower install flexbox-grid-mixins --save
86-
```
87-
8882
### Manual Install
8983

9084
Include sass/\_flexbox-grid-mixins.scss in the appropriate location in your project.
@@ -130,16 +124,22 @@ See Flexbox Grid Mixins documentation: [http://thingsym.github.io/flexbox-grid-m
130124

131125
[flexbox-grid-mixins - npm](https://www.npmjs.com/package/flexbox-grid-mixins)
132126

133-
### Mixins Reference and Example
127+
## Mixins Reference
134128

135129
* [Mixins Reference](http://thingsym.github.io/flexbox-grid-mixins/#Mixins-Reference)
130+
131+
## Example
132+
136133
* [Basic Example](http://thingsym.github.io/flexbox-grid-mixins/#Basic-Example)
137134
* [Grid System Example](http://thingsym.github.io/flexbox-grid-mixins/#Grid-System-Example)
138135
* [Flexbox Grid Mixins Example](http://thingsym.github.io/flexbox-grid-mixins/example/example.html)
139136
* [Holy Grail Layout - Using Flexbox Grid Mixins](http://thingsym.github.io/flexbox-grid-mixins/example/holy-grail-layout.html)
140137
* [Responsive web design - Using Flexbox Grid Mixins](http://thingsym.github.io/flexbox-grid-mixins/example/responsive.html)
141138
* [Unit-Set Grid (Experimental stage)](http://thingsym.github.io/flexbox-grid-mixins/example/unit-set.html)
139+
* [Box Sizing using Variable Defaults](http://thingsym.github.io/flexbox-grid-mixins/example/box-sizing.html)
140+
* [Stack](http://thingsym.github.io/flexbox-grid-mixins/example/stack.html)
142141
* [Grid Type](http://thingsym.github.io/flexbox-grid-mixins/example/grid-type.html)
142+
* [Testing Stick Out Grid](http://thingsym.github.io/flexbox-grid-mixins/example/test-stick-out.html)
143143

144144
### Development
145145

@@ -166,6 +166,16 @@ Small patches and bug reports can be submitted a issue tracker in Github. Forkin
166166

167167
## Changelog
168168

169+
* Version 0.2.0
170+
* update example
171+
* update package.json
172+
* add Variable Defaults flexbox-grid-mixins-stack
173+
* change margin property, remove @mixin, grid-margin and grid-col-margin
174+
* remove breakpoint value of col argument
175+
* remove condensed argument
176+
* change grid-type from argument to Variable Defaults flexbox-grid-mixins-grid-type
177+
* remove bower.json
178+
* add .travis.yml
169179
* Version 0.1.6
170180
* add Variable Defaults $flexbox-grid-mixins-box-sizing
171181
* update package.json
@@ -205,4 +215,4 @@ Licensed under the MIT License.
205215

206216
[thingsym](https://github.com/thingsym)
207217

208-
Copyright (c) 2016 thingsym
218+
Copyright (c) 2016-2020 thingsym

bower.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)