bootstrap-sass 3.1.1.1 → 3.2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d3f1fad60e55fbb88ef5e8a50535ccd5a05a20a4
-  data.tar.gz: e574370f0aa62a710bb5f382a7a7582f5bb01afd
+SHA256:
+  metadata.gz: 6050eccd4daf64b5e5d72bca8ac1292f271cf035c73b3e5eff62f385816fa2f3
+  data.tar.gz: 387b67ca35856109dc25957a2eb2da470dc65a6cd53d5facdeb10d12c9f943d6
 SHA512:
-  metadata.gz: 73d37a1223e4b25fd3ecd6cab281255f9994afe8410982de4e13942f9168b967b5ec1d4f6ff8268a1bbf69194907f9f38d1e04725efbcea3a5bc8d2a83c5be03
-  data.tar.gz: 68ff6488249a052a596ec8cdfa0af5753ac9b2f55c16d3b3812651df5da63d2688c5674c548b5c898d6774697936680dbf2a1ef50e1b287bf99fe4eca433fe9f
+  metadata.gz: 41456d7bbd25cc93328e1ae7038636f54200fbc021b841fb52882226a527b5aa8da37a2311df2c189eb8c5e25c9c78f75fa475c664b4a7147f21f332081191aa
+  data.tar.gz: '0732993db77d14da653cf64d5d1cca86cb948c4337bda6ee9f256fbedcaf03f55fce53b5eedb0abcbc042ff443c9efccfb2fc88a0e0dad504f78f2fa366ce1d9'

data/.gitignore

@@ -3,6 +3,7 @@
 bootstrap.css
 bootstrap-responsive.css
 Gemfile.lock
+*.gemfile.lock
 .rvmrc
 .rbenv-version
 

data/.travis.yml

@@ -3,13 +3,17 @@ rvm:
   - 2.1.1
   - 2.0.0
   - jruby
-  - rbx
+  - rbx-2
 gemfile:
   - test/gemfiles/sass_3_2.gemfile
   - test/gemfiles/sass_3_3.gemfile
   - test/gemfiles/sass_head.gemfile
 before_install:
-  - "npm install node-sass mincer ejs"
+  - "npm install"
 matrix:
   allow_failures:
+    # rbx has issues https://github.com/rubinius/rubinius/issues/3060
+    - rvm: rbx-2
     - gemfile: test/gemfiles/sass_head.gemfile
+notifications:
+  slack: heybb:3n88HHilXn76ji9vV4gL819Y

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## 3.2.0.2
+
+Fixed a number of bugs. [Issues closed in v3.2.0.2](https://github.com/twbs/bootstrap-sass/issues?q=is%3Aissue+is%3Aclosed+milestone%3Av3.2.0.2).
+
+## 3.2.0.1
+
+Fixed a number of bugs: [Issues closed in v3.2.0.1](https://github.com/twbs/bootstrap-sass/issues?q=is%3Aissue+is%3Aclosed+milestone%3Av3.2.0.1).
+
+## 3.2.0.0
+
+- 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, Sprockets, and Mincer asset path helpers are now provided in pure Sass: `bootstrap-compass`, `bootstrap-sprockets`, and `bootstrap-mincer`.
+Asset path helpers must be imported before `bootstrap`, more in Readme.
+- Sprockets / Mincer JS manifest has been moved to `bootstrap-sprockets.js`.
+It can be required without adding Bootstrap JS directory to load path, as it now uses relative paths.
+- Sprockets: `depend_on_asset` (`glyphicons.scss`) has been changed to `depend_on` to work around an issue with `depend_on_asset`.
+[More information](https://github.com/twbs/bootstrap-sass/issues/592#issuecomment-46570286).
+
 ## 3.1.1.0
 
 - Updated Bower docs

data/Gemfile

@@ -1,15 +1,10 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
 
-platform :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'json', '>= 1.8.1'
-  gem 'rubysl-test-unit', '~> 2.0'
-  gem 'racc'
-end
+# Compass for the dummy app
+gem 'compass', require: false
 
-platform :jruby do
-  gem 'test-unit'
+group :development do
+  gem 'byebug', platform: :mri_21, require: false
 end
-

data/README.md

@@ -1,4 +1,4 @@
-# Bootstrap for Sass [![Build Status](http://img.shields.io/travis/twbs/bootstrap-sass.svg)](http://travis-ci.org/twbs/bootstrap-sass)
+# Bootstrap for Sass [![Gem Version](https://badge.fury.io/rb/bootstrap-sass.svg)](http://badge.fury.io/rb/bootstrap-sass) [![Bower Version](https://badge.fury.io/bo/bootstrap-sass-official.svg)](http://badge.fury.io/bo/bootstrap-sass-official) [![Build Status](http://img.shields.io/travis/twbs/bootstrap-sass.svg)](http://travis-ci.org/twbs/bootstrap-sass)
 
 `bootstrap-sass` is a Sass-powered version of [Bootstrap](http://github.com/twbs/bootstrap), ready to drop right into your Sass powered applications.
 
@@ -6,6 +6,10 @@
 
 Please see the appropriate guide for your environment of choice:
 
+* [Ruby on Rails](#a-ruby-on-rails).
+* [Compass](#b-compass-without-rails) not on Rails.
+* [Bower](#c-bower).
+
 ### a. Ruby on Rails
 
 `bootstrap-sass` is easy to drop into Rails with the asset pipeline.
@@ -13,18 +17,66 @@ 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.2.0'
 gem 'sass-rails', '>= 3.2'
-gem 'bootstrap-sass', '~> 3.1.1'
+```
+
+It is also recommended to use [Autoprefixer](https://github.com/ai/autoprefixer-rails) with Bootstrap
+to add browser vendor prefixes automatically. Simply add the gem:
+
+```ruby
+gem 'autoprefixer-rails'
 ```
 
 `bundle install` and restart your server to make the files available through the pipeline.
 
+Import Bootstrap styles in `app/assets/stylesheets/application.css.scss`:
+
+```scss
+@import "bootstrap-sprockets";
+@import "bootstrap";
+```
+
+Make sure the file has `.css.scss` extension (or `.css.sass` for Sass syntax). If you have just generated a new Rails app,
+it may come with a `.css` file instead. If this file exists, it will be served instead of Sass, so remove it:
+
+```console
+$ rm app/assets/stylesheets/application.css
+```
+
+Do not use `//= require` in Sass or your other stylesheets will not be [able to access][antirequire] the Bootstrap mixins or variables.
+
+Require Bootstrap Javascripts in `app/assets/javascripts/application.js`:
+
+```js
+//= require jquery
+//= require bootstrap-sprockets
+```
+
+#### Bower with Rails
+
+When using [bootstrap-sass Bower package](#c-bower) in Rails, ensure [minimum Sass number precision](#sass-number-precision):
+
+```ruby
+# e.g. config/initializers/sass.rb
+::Sass::Script::Number.precision = [10, ::Sass::Script::Number.precision].max
+```
+
+`bootstrap-sprockets` must be imported before `bootstrap` for the icon fonts to work.
 
 #### Rails 3.2.x
 
-For Rails 3.2.x, make sure bootstrap-sass is moved out of the `:assets` group.
-This is because, by default, assets group gems are not required in `production`.
-However, for pre-compilation to succeed in production, `bootstrap-sass` gem must be required.
+Rails 3.2 is [no longer maintained for bugfixes](http://guides.rubyonrails.org/maintenance_policy.html), and you should upgrade as soon as possible.
+
+Starting with bootstrap-sass v3.1.1.1, due to the structural changes from upstream you will need these
+backported asset pipeline gems on Rails 3.2. There is more on why this is necessary in
+https://github.com/twbs/bootstrap-sass/issues/523 and https://github.com/twbs/bootstrap-sass/issues/578.
+
+```ruby
+gem 'sprockets-rails', '=2.0.0.backport1'
+gem 'sprockets', '=2.2.2.backport2'
+gem 'sass-rails', github: 'guilleiguaran/sass-rails', branch: 'backport'
+```
 
 ### b. Compass without Rails
 
@@ -41,52 +93,49 @@ require 'bootstrap-sass'
 ```
 
 ```console
-bundle exec compass install bootstrap
+$ bundle exec compass install bootstrap
 ```
 
 If you are creating a new Compass project, you can generate it with bootstrap-sass support:
 
 ```console
-bundle exec compass create my-new-project -r bootstrap-sass --using bootstrap
+$ bundle exec compass create my-new-project -r bootstrap-sass --using bootstrap
 ```
 
 or, alternatively, if you're not using a Gemfile for your dependencies:
 
 ```console
-compass create my-new-project -r bootstrap-sass --using bootstrap
+$ compass create my-new-project -r bootstrap-sass --using bootstrap
 ```
 
 This will create a new Compass project with the following files in it:
 
-* [_variables.scss](/templates/project/_variables.sass.erb) - all of bootstrap variables (override them here).
-* [styles.scss](/templates/project/styles.sass) - main project SCSS file, import `variables` and `bootstrap`.
+* [styles.sass](/templates/project/styles.sass) - main project Sass file, imports Bootstrap and variables.
+* [_bootstrap-variables.sass](/templates/project/_bootstrap-variables.sass.erb) - all of Bootstrap variables, override them here.
 
 Some bootstrap-sass mixins may conflict with the Compass ones.
 If this happens, change the import order so that Compass mixins are loaded later.
 
-### c. Ruby without Compass / Rails
-
-Require the gem, and load paths and Sass helpers will be configured automatically:
-
-```ruby
-require 'bootstrap-sass'
-```
-
-### d. Node.js / Bower
+### c. Bower
 
 Using bootstrap-sass as a Bower package is still being tested. It is compatible with node-sass 0.8.3+. You can install it with:
 
-```bash
-bower install bootstrap-sass-official
+```console
+$ bower install bootstrap-sass-official
 ```
 
 `bootstrap-sass` is taken so make sure you use the command above.
 
-Sass, JS, and all other assets are located at [vendor/assets](/vendor/assets).
+Sass, JS, and all other assets are located at [assets](/assets).
+
+By default, `bower.json` main field list only the main `bootstrap.scss` and all the static assets (fonts and JS).
+This is compatible by default with asset managers such as [wiredep](https://github.com/taptapship/wiredep).
 
-#### Mincer
+#### Node.js Mincer
 
-If you use [mincer][mincer] with node-sass, import bootstrap into a `.css.ejs.scss` file  like so:
+If you use [mincer][mincer] with node-sass, import bootstrap into like so:
+
+In `application.css.ejs.scss` (NB **.css.ejs.css**):
 
 ```scss
 // Import mincer asset paths helper integration
@@ -94,47 +143,95 @@ If you use [mincer][mincer] with node-sass, import bootstrap into a `.css.ejs.sc
 @import "bootstrap";
 ```
 
+In `application.js`:
+
+```js
+//= require bootstrap-sprockets
+```
+
 See also this [example manifest.js](/test/dummy_node_mincer/manifest.js) for mincer.
 
-#### Number precision
+
+### Configuration
+
+#### Sass
+
+By default all of Bootstrap is imported.
+
+You can also import components explicitly. To start with a full list of modules copy
+[`bootstrap.scss`](assets/stylesheets/bootstrap.scss) file into your assets as `bootstrap-custom.scss`.
+Then comment out components you do not want from `bootstrap-custom`.
+In the application Sass file, replace `@import 'bootstrap'` with:
+
+```scss
+@import 'bootstrap-custom';
+```
+
+#### Sass: Number Precision
 
 bootstrap-sass [requires](https://github.com/twbs/bootstrap-sass/issues/409) minimum [Sass number precision][sass-precision] of 10 (default is 5).
 
-When using ruby Sass compiler with the bower version you can enforce the limit with:
+Precision is set for Rails and Compass automatically.
+When using ruby Sass compiler standalone or with the Bower version you can set it with:
 
 ```ruby
 ::Sass::Script::Number.precision = [10, ::Sass::Script::Number.precision].max
 ```
 
-Precision option is now available in libsass, but it has not made into node-sass yet.
+Note that libsass and node-sass do not currently support the precision option, due to an open bug ([bug #364](https://github.com/sass/libsass/issues/364)) in libsass.
+
+
+#### Sass: Autoprefixer
+
+Using [Autoprefixer][autoprefixer] with Bootstrap is recommended.
+[Autoprefixer][autoprefixer] adds vendor prefixes to CSS rules using values from [Can I Use](http://caniuse.com/).
+
+#### JavaScript
+
+[`assets/javascripts/bootstrap.js`](/assets/javascripts/bootstrap.js) contains all of Bootstrap JavaScript,
+concatenated in the [correct order](/assets/javascripts/bootstrap-sprockets.js).
+
+
+#### JavaScript with Sprockets or Mincer
+
+If you use Sprockets or Mincer, you can require `bootstrap-sprockets` instead to load the individual modules:
+
+```js
+// Load all Bootstrap JavaScript
+//= require bootstrap-sprockets
+```
+
+You can also load individual modules, provided you also require any dependencies.
+You can check dependencies in the [Bootstrap JS documentation][jsdocs].
 
-#### JS and fonts
+```js
+//= require bootstrap/scrollspy
+//= require bootstrap/modal
+//= require bootstrap/dropdown
+```
 
-Assets are discovered automatically on Rails, Sprockets, Compass, and Node + Mincer, using native asset path helpers.
+#### Fonts
 
-Otherwise the fonts are referenced as:
+The fonts are referenced as:
 
-```sass
+```scss
 "#{$icon-font-path}#{$icon-font-name}.eot"
 ```
 
-`$icon-font-path` defaults to `bootstrap/`.
+`$icon-font-path` defaults to `bootstrap/` if asset path helpers are used, and `../fonts/bootstrap/` otherwise.
 
-When not using an asset pipeline, you can copy fonts and JS from bootstrap-sass, they are located at [vendor/assets](/vendor/assets):
+When using bootstrap-sass with Compass, Sprockets, or Mincer, you **must** import the relevant path helpers before Bootstrap itself, for example:
 
-```bash
-mkdir public/fonts
-cp -r $(bundle show bootstrap-sass)/vendor/assets/fonts/ public/fonts/
-mkdir public/javascripts
-cp -r $(bundle show bootstrap-sass)/vendor/assets/javascripts/ public/javascripts/
+```scss
+@import "bootstrap-compass";
+@import "bootstrap";
 ```
 
 ## Usage
 
 ### Sass
 
-Import Bootstrap into a Sass file (for example, `application.css.scss`) to get all of Bootstrap's styles, mixins and variables!
-We recommend against using `//= require` directives, since none of your other stylesheets will be [able to access][antirequire] the Bootstrap mixins or variables.
+Import Bootstrap into a Sass file (for example, application.css.scss) to get all of Bootstrap's styles, mixins and variables!
 
 ```scss
 @import "bootstrap";
@@ -156,38 +253,6 @@ $navbar-default-color: $light-orange;
 @import "bootstrap";
 ```
 
-You can also import components explicitly. To start with a full list of modules copy this file from the gem:
-
-```bash
-cp $(bundle show bootstrap-sass)/vendor/assets/stylesheets/bootstrap.scss \
- app/assets/stylesheets/bootstrap-custom.scss
-```
-Comment out components you do not want from `bootstrap-custom`.
-
-In `application.sass`, replace `@import 'bootstrap'` with:
-
-```scss
-  @import 'bootstrap-custom';
-```
-
-### Javascript
-
-We have a helper that includes all Bootstrap javascripts. If you use Rails (or Sprockets separately),
-put this in your Javascript manifest (usually in `application.js`) to load the files in the [correct order](/vendor/assets/javascripts/bootstrap.js):
-
-```js
-// Loads all Bootstrap javascripts
-//= require bootstrap
-```
-
-You can also load individual modules, provided you also require any dependencies. You can check dependencies in the [Bootstrap JS documentation][jsdocs].
-
-```js
-//= require bootstrap/scrollspy
-//= require bootstrap/modal
-//= require bootstrap/dropdown
-```
-
 ---
 
 ## Development and Contributing
@@ -214,9 +279,8 @@ To convert a specific branch or version, pass the branch name or the commit hash
 The latest converter script is located [here][converter] and does the following:
 
 * Converts upstream bootstrap LESS files to its matching SCSS file.
-* Copies all upstream JavaScript into `vendor/assets/javascripts/bootstrap`
-* Generates a javascript manifest at `vendor/assets/javascripts/bootstrap.js`
-* Copies all upstream font files into `vendor/assets/fonts/bootstrap`
+* Copies all upstream JavaScript into `assets/javascripts/bootstrap`, an Sprockets manifest at `assets/javascripts/bootstrap-sprockets.js`, and a concatenation at `assets/javascripts/bootstrap.js`.
+* Copies all upstream font files into `assets/fonts/bootstrap`.
 * Sets `Bootstrap::BOOTSTRAP_SHA` in [version.rb][version] to the branch sha.
 
 This converter fully converts original LESS to SCSS. Conversion is automatic but requires instructions for certain transformations (see converter output).
@@ -247,3 +311,4 @@ Michael Hartl's [Rails Tutorial](http://railstutorial.org/), [gitlabhq](http://g
 [jsdocs]: http://getbootstrap.com/javascript/#transitions
 [sass-precision]: http://sass-lang.com/documentation/Sass/Script/Number.html#precision-class_method
 [mincer]: https://github.com/nodeca/mincer
+[autoprefixer]: https://github.com/ai/autoprefixer

data/Rakefile

@@ -1,3 +1,6 @@
+lib_path = File.join(File.dirname(__FILE__), 'lib')
+$:.unshift(lib_path) unless $:.include?(lib_path)
+
 load './tasks/bower.rake'
 
 require 'rake/testtask'
@@ -10,7 +13,6 @@ end
 desc 'Dumps output to a CSS file for testing'
 task :debug do
   require 'sass'
-  require './lib/bootstrap-sass/sass_functions'
   path = Bootstrap.stylesheets_path
   %w(bootstrap).each do |file|
     engine = Sass::Engine.for_file("#{path}/#{file}.scss", syntax: :scss, load_paths: [path])
@@ -32,13 +34,10 @@ end
 
 desc 'Compile bootstrap-sass to tmp/ (or first arg)'
 task :compile, :css_path do |t, args|
-  lib_path = File.join(File.dirname(__FILE__), 'lib')
-  $:.unshift(lib_path) unless $:.include?(lib_path)
   require 'sass'
-  require 'bootstrap-sass/sass_functions'
   require 'term/ansicolor'
 
-  path = 'vendor/assets/stylesheets'
+  path = 'assets/stylesheets'
   css_path = args.with_defaults(css_path: 'tmp')[:css_path]
   puts Term::ANSIColor.bold "Compiling SCSS in #{path}"
   Dir.mkdir(css_path) unless File.directory?(css_path)