Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-sass.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Mazovetskiy <glebm@google.com>2015-01-20 03:55:14 +0300
committerGleb Mazovetskiy <glebm@google.com>2015-01-20 03:56:26 +0300
commit107ca189e406bbe314eb84f0372ed3706b81c761 (patch)
treeddd6fbf4cd46bbb827770ccc36e659e7e78565e8
parenta477f37b57edec1665d996122abe31424b3b1841 (diff)
Bump to v3.3.3v3.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**.
-rw-r--r--CHANGELOG.md9
-rw-r--r--README.md4
-rw-r--r--bower.json2
-rw-r--r--lib/bootstrap-sass/version.rb2
-rw-r--r--package.json2
-rw-r--r--tasks/bower.rake2
-rw-r--r--templates/project/_bootstrap-variables.sass2
7 files changed, 16 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 237b58c9..7d31b5f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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)
diff --git a/README.md b/README.md
index e0e7f598..2499ab02 100644
--- a/README.md
+++ b/README.md
@@ -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'
```
@@ -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).
diff --git a/bower.json b/bower.json
index c9c532e3..9888da62 100644
--- a/bower.json
+++ b/bower.json
@@ -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",
diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb
index 4d349b12..7dcc4803 100644
--- a/lib/bootstrap-sass/version.rb
+++ b/lib/bootstrap-sass/version.rb
@@ -1,4 +1,4 @@
module Bootstrap
- VERSION = '3.3.2.1'
+ VERSION = '3.3.3'
BOOTSTRAP_SHA = 'bcf7dd38b5ab180256e2e4fb5da0369551b3f082'
end
diff --git a/package.json b/package.json
index ebd10f8f..10596ae3 100644
--- a/package.json
+++ b/package.json
@@ -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": {
diff --git a/tasks/bower.rake b/tasks/bower.rake
index 5598e883..15de8ef7 100644
--- a/tasks/bower.rake
+++ b/tasks/bower.rake
@@ -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)
diff --git a/templates/project/_bootstrap-variables.sass b/templates/project/_bootstrap-variables.sass
index ab546525..86fd4f2f 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.2.1):
+// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.3):
//
// Variables