mirror of
https://github.com/twbs/bootstrap-sass.git
synced 2022-11-09 12:27:02 -05:00
bump to v3.2.0.0
This commit is contained in:
parent
3b9a620e36
commit
a5f5954268
6 changed files with 6 additions and 6 deletions
|
@ -1,6 +1,6 @@
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## 3.2.0.0 (unreleased)
|
## 3.2.0.0
|
||||||
|
|
||||||
- Assets (Sass, JS, fonts) moved from `vendor/assets` to `assets`. `bootstrap.js` now contains concatenated JS.
|
- Assets (Sass, JS, fonts) moved from `vendor/assets` to `assets`. `bootstrap.js` now contains concatenated JS.
|
||||||
- Compass generator now copies JS and fonts, and provides a better default `styles.sass`.
|
- Compass generator now copies JS and fonts, and provides a better default `styles.sass`.
|
||||||
|
|
|
@ -13,7 +13,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.
|
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
|
```ruby
|
||||||
gem 'bootstrap-sass', '~> 3.1.1'
|
gem 'bootstrap-sass', '~> 3.2.0'
|
||||||
gem 'sass-rails', '>= 3.2'
|
gem 'sass-rails', '>= 3.2'
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "bootstrap-sass",
|
"name": "bootstrap-sass",
|
||||||
"version": "3.1.1",
|
"version": "3.2.0",
|
||||||
"homepage": "https://github.com/twbs/bootstrap-sass",
|
"homepage": "https://github.com/twbs/bootstrap-sass",
|
||||||
"authors": [
|
"authors": [
|
||||||
"Thomas McDonald",
|
"Thomas McDonald",
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "3.1.x-dev"
|
"dev-master": "3.2.x-dev"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
module Bootstrap
|
module Bootstrap
|
||||||
VERSION = '3.1.1.1'
|
VERSION = '3.2.0.0'
|
||||||
BOOTSTRAP_SHA = 'c068162161154a4b85110ea1e7dd3d7897ce2b72'
|
BOOTSTRAP_SHA = 'c068162161154a4b85110ea1e7dd3d7897ce2b72'
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "bootstrap-sass",
|
"name": "bootstrap-sass",
|
||||||
"version": "3.1.1",
|
"version": "3.2.0",
|
||||||
"description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
|
"description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|
Loading…
Add table
Reference in a new issue