README.md in bootstrap-sass-3.0.2.0 vs README.md in bootstrap-sass-3.0.2.1

- old
+ new

@@ -1,10 +1,10 @@ # Bootstrap for Sass [![Build Status](https://secure.travis-ci.org/thomas-mcdonald/bootstrap-sass.png?branch=master)](http://travis-ci.org/thomas-mcdonald/bootstrap-sass) [![Code Climate](https://codeclimate.com/github/thomas-mcdonald/bootstrap-sass.png)](https://codeclimate.com/github/thomas-mcdonald/bootstrap-sass) -`bootstrap-sass` is an Sass-powered version of [Bootstrap](http://github.com/twbs/bootstrap), ready to drop right into your Sass powered applications. +`bootstrap-sass` is a Sass-powered version of [Bootstrap](http://github.com/twbs/bootstrap), ready to drop right into your Sass powered applications. ## Installation Please see the appropriate guide for your environment of choice: @@ -14,20 +14,20 @@ 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 'sass-rails', '>= 3.2' # sass-rails needs to be higher than 3.2 -gem 'bootstrap-sass', '~> 3.0.1.0.rc' +gem 'bootstrap-sass', '~> 3.0.2.0' ``` `bundle install` and restart your server to make the files available through the pipeline. ### b. Compass (no Rails) Install the gem -```console -gem install bootstrap-sass --pre +```sh +gem install bootstrap-sass ``` If you have an existing Compass project: ```ruby @@ -51,13 +51,14 @@ * [styles.scss](/templates/project/styles.scss) - main project SCSS file, import `variables` and `bootstrap`. ## Usage -### CSS / SCSS / SASS +### Sass -Import Bootstrap in an SCSS 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! +We recommend against using `//= require` directives, since none of your other stylesheets will be [able to access][antirequire] the Bootstrap mixins or variables. ```scss @import "bootstrap"; ``` @@ -75,27 +76,23 @@ $navbar-default-color: $light-orange; @import "bootstrap"; ``` -For granular control over what is imported, instead of `@import "bootstrap"`, explicitly specify which modules and components should be included. +You can also import components explicitly. To start with a full list of modules copy this file from the gem: -Copy `bootstrap.scss` from the gem into the project's vendor/ as `bootstrap-custom.scss`. - ```bash cp $(bundle show bootstrap-sass)/vendor/assets/stylesheets/bootstrap/bootstrap.scss \ vendor/assets/stylesheets/bootstrap-custom.scss ``` -Comment out the import statements you do not need from `bootstrap-custom.scss`. +In your `application.sass`, replace `@import 'bootstrap'` with: -Finally, in your `application.sass`: - ```scss @import 'bootstrap-custom'; ``` -NB: This file now needs to be manually kept up to date with structural changes from upstream. +Comment out any modules you don't need from `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):