Skip to content

Commit

Permalink
Bump to 3.3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
glebm committed Jun 16, 2015
1 parent 4536e9e commit d64d48f
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 4 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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'
```

Expand Down Expand Up @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion lib/bootstrap-sass/version.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Bootstrap
VERSION = '3.3.4.1'
VERSION = '3.3.5'
BOOTSTRAP_SHA = '16b48259a62f576e52c903c476bd42b90ab22482'
end
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion templates/project/_bootstrap-variables.sass
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit d64d48f

Please sign in to comment.