Skip to content

Commit

Permalink
Bump to v3.3.3
Browse files Browse the repository at this point in the history
This is a re-packaged release of 3.3.2.1 (v3.3.2+1).

Versions are now strictly semver.
The PATCH version may be ahead of the upstream.

Framework version: Bootstrap **v3.3.2**.
  • Loading branch information
glebm committed Jan 20, 2015
1 parent a477f37 commit 107ca18
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 7 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## 3.3.3

This is a re-packaged release of 3.3.2.1 (v3.3.2+1).

Versions are now strictly semver.
The PATCH version may be ahead of the upstream.

Framework version: Bootstrap **v3.3.2**.

## 3.3.2.1

* Fix glyphicons regression (revert 443d5b49eac84aec1cb2f8ea173554327bfc8c14)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,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.2'
gem 'bootstrap-sass', '~> 3.3.3'
gem 'sass-rails', '>= 3.2'
```

Expand Down Expand Up @@ -136,7 +136,7 @@ If this happens, change the import order so that Compass mixins are loaded later
bootstrap-sass Bower package is compatible with node-sass 1.2.3+. You can install it with:
```console
$ bower install bootstrap-sass\#v3.3.2+1
$ bower install bootstrap-sass
```
Sass, JS, and all other assets are located at [assets](/assets).
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bootstrap-sass",
"version": "3.3.2",
"version": "3.3.3",
"homepage": "https://github.com/twbs/bootstrap-sass",
"authors": [
"Thomas McDonald",
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.2.1'
VERSION = '3.3.3'
BOOTSTRAP_SHA = 'bcf7dd38b5ab180256e2e4fb5da0369551b3f082'
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.2",
"version": "3.3.3",
"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 tasks/bower.rake
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace :bower do
find_files.(Bootstrap.fonts_path) +
%w(assets/javascripts/bootstrap.js)

spec['version'] = Bootstrap::VERSION[0..-3]
spec['version'] = Bootstrap::VERSION

File.open('bower.json', 'w') do |f|
f.puts JSON.pretty_generate(spec)
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.2.1):
// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.3):
//
// Variables
Expand Down

0 comments on commit 107ca18

Please sign in to comment.