diff options
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | lib/bootstrap-sass/version.rb | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | templates/project/_bootstrap-variables.sass | 2 |
5 files changed, 11 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 5dff7ff9..01137960 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. @@ -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 3373acfe..d3511c7c 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 96795256..045b9180 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 ab993038..6c6ec85e 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 |