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-05-14 00:15:17 +0400
committerThomas McDonald <tom@conceptcoding.co.uk>2012-05-14 00:15:17 +0400
commite2c102066a0c32f5db09b3f443529e612be22231 (patch)
tree0ac43ee381dfbd643ff5a3ad5fce22672a85002d
parentb09bf38b71ac0cd8b9e16099e81a399b67b9f264 (diff)
update changelog and version number in readme
-rw-r--r--CHANGELOG.md7
-rw-r--r--README.md2
2 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc5c9985..6b4e4e56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,13 +2,16 @@
## 2.0.3 (Unreleased)
* Updated to Bootstrap 2.0.3
-* [#106] Support for Rails < 3.1 w/Compass
+* [#106] Support for Rails < 3.1 through Compass
+* [#132] Add CI testing
+* [#106] Support Rails w/Compass
+* [#134] Fix support for Rails w/Compass
## 2.0.2
* [#86] Updated to Bootstrap 2.0.2
Things of note: static navbars now have full width. (to be fixed in 2.0.3) `.navbar-inner > .container { width:940px; }` seems to work in the meanwhile
* [#62] Fixed asset compilation taking a *very* long time.
-* [#69, #79, #80] (Hopefully) clarified README. Now with less cat humour.
+* [#69, #79, #80] \(Hopefully) clarified README. Now with less cat humour.
* [#91] Removed doubled up Sass extensions for Rails.
* [#63, #73] Allow for overriding of image-path
* [[SO](http://stackoverflow.com/a/9909626/241212)] Added makeFluidColumn mixin for defining fluid columns. Fluid rows must use `@extend .row-fluid`, and any column inside it can use `@include makeFluidColumn(num)`, where `num` is the number of columns. Unfortunately, there is a rather major limitation to this: margins on first-child elements must be overriden. See the attached Stack Overflow answer for more information.
diff --git a/README.md b/README.md
index bc5ff128..acc56430 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Updating your application to a new version of `bootstrap-sass`? See our [changel
In your Gemfile:
gem 'sass-rails', '~> 3.1'
- gem 'bootstrap-sass', '~> 2.0.2'
+ gem 'bootstrap-sass', '~> 2.0.3'
#### CSS