Skip to content

Commit 375e260

Browse files
committed
Merge branch 'release-0.1.6'
2 parents dbbb566 + 603978f commit 375e260

File tree

12 files changed

+5060
-2598
lines changed

12 files changed

+5060
-2598
lines changed

Gemfile

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

README.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,8 @@ See Flexbox Grid Mixins documentation: [http://thingsym.github.io/flexbox-grid-m
149149
4. Forking on GitHub
150150
5. run ```$ cd /path/to/flexbox-grid-mixins```
151151
6. run ```$ npm install```
152-
7. run ```$ bundle install --path vendor/bundle```
153-
8. run ```$ gulp serve```
154-
9. Access URL http://localhost:3000
152+
7. run ```$ gulp serve```
153+
8. Access URL http://localhost:3000
155154

156155
## Contribution
157156

@@ -163,13 +162,17 @@ Small patches and bug reports can be submitted a issue tracker in Github. Forkin
163162
2. Create a feature branch: git checkout -b my-new-feature
164163
3. Commit your changes: git commit -am 'Add some feature'
165164
4. Push to the branch: git push origin my-new-feature
166-
5. Create new Pull Request
165+
5. Create new Pull Request on GitHub
167166

168167
## Changelog
169168

169+
* Version 0.1.6
170+
* add Variable Defaults $flexbox-grid-mixins-box-sizing
171+
* update package.json
172+
* change lint from scss-lint to stylelint
170173
* Version 0.1.5
171174
* update package.json
172-
* add optional arguments $shorthand
175+
* add optional arguments $shorthand to @mixin grid-col
173176
* Version 0.1.4
174177
* update example
175178
* update document

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "flexbox-grid-mixins",
3-
"version": "0.1.5",
3+
"version": "0.1.6",
44
"homepage": "https://github.com/thingsym/flexbox-grid-mixins",
55
"author": "Thingsym",
66
"description": "Sass Mixins to generate Flexbox grid",

0 commit comments

Comments
 (0)