From 7683418d92901567ebb55dd9f1e5e5aae9fbde9e Mon Sep 17 00:00:00 2001 From: Thomas McDonald Date: Wed, 31 Oct 2012 14:44:07 +0000 Subject: [PATCH] Version 2.1.1 --- CHANGELOG.md | 7 +++++++ README.md | 4 ++-- bootstrap-sass.gemspec | 2 +- vendor/assets/stylesheets/_bootstrap-responsive.scss | 2 +- vendor/assets/stylesheets/_bootstrap.scss | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c346e318..5666018b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +# 2.1.1.0 +* Update to Bootstrap 2.1.1 +* [#222] Remove 100% multiplier in vertical-three-colours +* [#227] Fix IE component animation collapse +* [#228] Fix variables documentation link +* [#231] Made .input-block-level a class as well as mixin + # 2.1.0.1 * [#219] Fix expected a color. Got: transparent. * [#207] Add missing warning style for table row highlighting diff --git a/README.md b/README.md index 632de2db..1954c1fe 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Enjoy. In your Gemfile: gem 'sass-rails', '~> 3.1' - gem 'bootstrap-sass', '~> 2.1.0.1' + gem 'bootstrap-sass', '~> 2.1.1.0' #### CSS @@ -92,7 +92,7 @@ Bootstrap [claims](https://github.com/twitter/bootstrap#versioning) to use SemVe ### Bundler? - gem 'bootstrap-sass', '~> 2.1.0.1' + gem 'bootstrap-sass', '~> 2.1.1.0' Don't use the standard `~> 2.1.x`. Your apps may break. diff --git a/bootstrap-sass.gemspec b/bootstrap-sass.gemspec index e4c87039..eebfe90b 100644 --- a/bootstrap-sass.gemspec +++ b/bootstrap-sass.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "bootstrap-sass" - s.version = '2.1.0.1' + s.version = '2.1.1.0' s.authors = ["Thomas McDonald"] s.email = 'tom@conceptcoding.co.uk' s.summary = "Twitter's Bootstrap, converted to Sass and ready to drop into Rails or Compass" diff --git a/vendor/assets/stylesheets/_bootstrap-responsive.scss b/vendor/assets/stylesheets/_bootstrap-responsive.scss index 4c1e6bf4..31e28677 100644 --- a/vendor/assets/stylesheets/_bootstrap-responsive.scss +++ b/vendor/assets/stylesheets/_bootstrap-responsive.scss @@ -1,5 +1,5 @@ // -// Bootstrap Responsive v2.1.0 +// Bootstrap Responsive v2.1.1 // // Copyright 2012 Twitter, Inc // Licensed under the Apache License v2.0 diff --git a/vendor/assets/stylesheets/_bootstrap.scss b/vendor/assets/stylesheets/_bootstrap.scss index 1cef1651..a88bd293 100644 --- a/vendor/assets/stylesheets/_bootstrap.scss +++ b/vendor/assets/stylesheets/_bootstrap.scss @@ -1,5 +1,5 @@ // -// Bootstrap v2.1.0 +// Bootstrap v2.1.1 // // Copyright 2012 Twitter, Inc // Licensed under the Apache License v2.0