diff --git a/CHANGELOG.md b/CHANGELOG.md index 87793627..884bf562 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ project adheres to [Semantic Versioning](http://semver.org). - Added `grid-push` functionality - Added `grid-shift` functionality - Added `grid-media` to allow the creation of media queries with custom grids +- Added `grid-collapse` to allow the creation of nested layouts ### Changed diff --git a/bower.json b/bower.json index 5c334281..cfd9f352 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "neat", "description": "A lightweight, semantic grid framework built with Bourbon", - "version": "2.0.0-alpha.1", + "version": "2.0.0-beta.1", "main": "core/_neat.scss", "license": "MIT", "ignore": [ diff --git a/core/_neat.scss b/core/_neat.scss index 5aef6cd9..9cec9847 100644 --- a/core/_neat.scss +++ b/core/_neat.scss @@ -1,5 +1,5 @@ @charset "UTF-8"; -// Neat 2.0.0-alpha.1 +// Neat 2.0.0-beta.1 // http://neat.bourbon.io // Copyright 2012 thoughtbot, inc. // MIT License diff --git a/lib/neat/version.rb b/lib/neat/version.rb index 2c608b4c..5bfcf8bd 100644 --- a/lib/neat/version.rb +++ b/lib/neat/version.rb @@ -1,3 +1,3 @@ module Neat - VERSION = "2.0.0.alpha.1" + VERSION = "2.0.0.beta.1" end diff --git a/package.json b/package.json index e1573aa1..d3a1356a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bourbon-neat", - "version": "2.0.0-alpha.1", + "version": "2.0.0-beta.1", "description": "A lightweight, semantic grid framework built with Bourbon", "keywords": [ "columns",