Bump to 3.3.6

twbs · Nov 24, 2015 · 446b41a · 446b41a
1 parent 5ad0746
commit 446b41a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## 3.3.6
+
+Bumps Sass dependency to 3.3.4+ to avoid compatibility issues with @at-root.
+Bumps node-sass dependency to ~3.4.2 for Node.js v5 compatibility. [#986](https://github.com/twbs/bootstrap-sass/issues/986)
+Fixes breadcrumb content issues on libsass. [#919](https://github.com/twbs/bootstrap-sass/issues/919)
+Fixes a Rails 5 compatibility issue. [#965](https://github.com/twbs/bootstrap-sass/pull/965)
+
+Framework version: Bootstrap **v3.3.6**
+
 ## 3.3.5
 
 Fix for standalone Compass extension compatibility. [#914](https://github.com/twbs/bootstrap-sass/issues/914)

diff --git a/README.md b/README.md
@@ -23,7 +23,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.5'
+gem 'bootstrap-sass', '~> 3.3.6'
 gem 'sass-rails', '>= 3.2'
 ```
 
@@ -287,6 +287,7 @@ The upstream versions vs the Bootstrap for Sass versions are:
 
 | Upstream |    Sass |
 |---------:|--------:|
+|    3.3.6 |   3.3.6 |
 |    3.3.5 |   3.3.5 |
 |    3.3.4 |   3.3.4 |
 |    3.3.2 |   3.3.3 |

diff --git a/bower.json b/bower.json
@@ -31,5 +31,6 @@
   ],
   "dependencies": {
     "jquery": ">= 1.9.0"
-  }
+  },
+  "version": "3.3.6"
 }
diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb
@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION       = '3.3.5.1'
+  VERSION       = '3.3.6'
   BOOTSTRAP_SHA = '81df608a40bf0629a1dc08e584849bb1e43e0b7a'
 end
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-sass",
-  "version": "3.3.5",
+  "version": "3.3.6",
   "description": "bootstrap-sass is a Sass-powered version of Bootstrap 3, 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
@@ -1,4 +1,4 @@
-// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.5.1):
+// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.6):
 
 //
 // Variables