Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-sass.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas McDonald <tom@conceptcoding.co.uk>2012-09-01 20:45:06 +0400
committerThomas McDonald <tom@conceptcoding.co.uk>2012-09-01 20:45:06 +0400
commit30e4345252e03f3db8dc176dd7ece8e4fb1feec4 (patch)
tree0fb6b6cf5e1c2fc1e039d96b322e798f9643be96
parentfb14b57702b058b2c5c97630c5489de44bd12ba9 (diff)
Update changelog with current 2.1.0.0 changes
-rw-r--r--CHANGELOG.md4
-rw-r--r--README.md2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a9cf6e3..7db2456b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog
+## 2.1.0.0
+* Updated to Bootstrap 2.1
+* Changed some mixin names to be more consistent. Nested mixins in Less are separated by a `-` when they are flattened in Sass.
+
## 2.0.4.1
* Fix `.row-fluid > spanX` nesting
* Small Javascript fixes for those staying on the 2.0.4 release
diff --git a/README.md b/README.md
index 243ee489..eeeb06cf 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Enjoy.
In your Gemfile:
gem 'sass-rails', '~> 3.1'
- gem 'bootstrap-sass', '~> 2.0.4.1'
+ gem 'bootstrap-sass', '~> 2.1.0.0'
#### CSS