Skip to content

Commit 446b41a

Browse files
committed
Bump to 3.3.6
1 parent 5ad0746 commit 446b41a

File tree

6 files changed

+16
-5
lines changed

6 files changed

+16
-5
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## 3.3.6
4+
5+
Bumps Sass dependency to 3.3.4+ to avoid compatibility issues with @at-root.
6+
Bumps node-sass dependency to ~3.4.2 for Node.js v5 compatibility. [#986](https://github.com/twbs/bootstrap-sass/issues/986)
7+
Fixes breadcrumb content issues on libsass. [#919](https://github.com/twbs/bootstrap-sass/issues/919)
8+
Fixes a Rails 5 compatibility issue. [#965](https://github.com/twbs/bootstrap-sass/pull/965)
9+
10+
Framework version: Bootstrap **v3.3.6**
11+
312
## 3.3.5
413

514
Fix for standalone Compass extension compatibility. [#914](https://github.com/twbs/bootstrap-sass/issues/914)

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Please see the appropriate guide for your environment of choice:
2323
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.
2424

2525
```ruby
26-
gem 'bootstrap-sass', '~> 3.3.5'
26+
gem 'bootstrap-sass', '~> 3.3.6'
2727
gem 'sass-rails', '>= 3.2'
2828
```
2929

@@ -287,6 +287,7 @@ The upstream versions vs the Bootstrap for Sass versions are:
287287

288288
| Upstream | Sass |
289289
|---------:|--------:|
290+
| 3.3.6 | 3.3.6 |
290291
| 3.3.5 | 3.3.5 |
291292
| 3.3.4 | 3.3.4 |
292293
| 3.3.2 | 3.3.3 |

bower.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,6 @@
3131
],
3232
"dependencies": {
3333
"jquery": ">= 1.9.0"
34-
}
34+
},
35+
"version": "3.3.6"
3536
}

lib/bootstrap-sass/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
module Bootstrap
2-
VERSION = '3.3.5.1'
2+
VERSION = '3.3.6'
33
BOOTSTRAP_SHA = '81df608a40bf0629a1dc08e584849bb1e43e0b7a'
44
end

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bootstrap-sass",
3-
"version": "3.3.5",
3+
"version": "3.3.6",
44
"description": "bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right into your Sass powered applications.",
55
"main": "assets/javascripts/bootstrap.js",
66
"repository": {

templates/project/_bootstrap-variables.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.5.1):
1+
// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.6):
22
33
//
44
// Variables

0 commit comments

Comments
 (0)