diff --git a/CHANGELOG.md b/CHANGELOG.md index 5dff7ff9c4..01137960bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 3.3.5 + +Fix for standalone Compass extension compatibility. [#914](https://github.com/twbs/bootstrap-sass/issues/914) + +Framework version: Bootstrap **v3.3.5** + ## 3.3.4 No Sass-specific changes. diff --git a/README.md b/README.md index 9e132120b5..092e186c5b 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Please see the appropriate guide for your environment of choice: In your Gemfile you need to add the `bootstrap-sass` gem, and ensure that the `sass-rails` gem is present - it is added to new Rails applications by default. ```ruby -gem 'bootstrap-sass', '~> 3.3.4' +gem 'bootstrap-sass', '~> 3.3.5' gem 'sass-rails', '>= 3.2' ``` @@ -285,6 +285,7 @@ The upstream versions vs the Bootstrap for Sass versions are: | Upstream | Sass | |---------:|--------:| +| 3.3.5 | 3.3.5 | | 3.3.4 | 3.3.4 | | 3.3.2 | 3.3.3 | | <= 3.3.1 | 3.3.1.x | diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb index 3373acfe11..d3511c7c13 100644 --- a/lib/bootstrap-sass/version.rb +++ b/lib/bootstrap-sass/version.rb @@ -1,4 +1,4 @@ module Bootstrap - VERSION = '3.3.4.1' + VERSION = '3.3.5' BOOTSTRAP_SHA = '16b48259a62f576e52c903c476bd42b90ab22482' end diff --git a/package.json b/package.json index 96795256b9..045b918063 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-sass", - "version": "3.3.4", + "version": "3.3.5", "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.", "main": "assets/javascripts/bootstrap.js", "repository": { diff --git a/templates/project/_bootstrap-variables.sass b/templates/project/_bootstrap-variables.sass index ab99303816..6c6ec85e6d 100644 --- a/templates/project/_bootstrap-variables.sass +++ b/templates/project/_bootstrap-variables.sass @@ -1,4 +1,4 @@ -// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.4.1): +// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.5): // // Variables