diff options
| author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2016-07-25 22:57:13 +0300 |
|---|---|---|
| committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2016-07-25 22:58:53 +0300 |
| commit | 5d6b2ebba0c2a5885ce2f0e01e9218db3d3b5e47 (patch) | |
| tree | 36b7e3b4d3a3d9a50e8a5189e8524b50c0f1ec1d | |
| parent | 563a9ba4bf1fc6fac62849ea9b67210be8c842dd (diff) | |
Bump to v3.3.7v3.3.73.3-stable
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | lib/bootstrap-sass/version.rb | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | templates/project/_bootstrap-variables.sass | 2 |
5 files changed, 10 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d591d7cc..a18bae06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 3.3.7 + +* Allows jQuery 3.x in bower.json. [#1048](https://github.com/twbs/bootstrap-sass/issues/1048) +* Adds the `style` and `sass` fields to package.json. [#1045](https://github.com/twbs/bootstrap-sass/issues/1045) +* Adds Eyeglass support. [#1007](https://github.com/twbs/bootstrap-sass/pull/1007) + ## 3.3.6 * Bumps Sass dependency to 3.3.4+ to avoid compatibility issues with @at-root. @@ -323,9 +323,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.4+ | same | | 3.3.2 | 3.3.3 | | <= 3.3.1 | 3.3.1.x | diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb index 25fde425..bf622f2a 100644 --- a/lib/bootstrap-sass/version.rb +++ b/lib/bootstrap-sass/version.rb @@ -1,4 +1,4 @@ module Bootstrap - VERSION = '3.3.6' + VERSION = '3.3.7' BOOTSTRAP_SHA = '0b9c4a4007c44201dce9a6cc1a38407005c26c86' end diff --git a/package.json b/package.json index 4dbb7c5e..cdefbeee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-sass", - "version": "3.3.6", + "version": "3.3.7", "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", "style": "assets/stylesheets/_bootstrap.scss", diff --git a/templates/project/_bootstrap-variables.sass b/templates/project/_bootstrap-variables.sass index 1ab0ce84..898495d4 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.6): +// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.7): // // Variables |