README.md in bootstrap-sass-3.3.7 vs README.md in bootstrap-sass-3.4.0

- old
+ new

@@ -1,33 +1,32 @@ -# Bootstrap for Sass +# Bootstrap 3 for Sass [![Gem Version](https://badge.fury.io/rb/bootstrap-sass.svg)](http://badge.fury.io/rb/bootstrap-sass) [![npm version](https://img.shields.io/npm/v/bootstrap-sass.svg?style=flat)](https://www.npmjs.com/package/bootstrap-sass) [![Bower Version](https://badge.fury.io/bo/bootstrap-sass.svg)](http://badge.fury.io/bo/bootstrap-sass) [![Build Status](https://img.shields.io/travis/twbs/bootstrap-sass.svg)](https://travis-ci.org/twbs/bootstrap-sass) `bootstrap-sass` is a Sass-powered version of [Bootstrap](https://github.com/twbs/bootstrap) 3, ready to drop right into your Sass powered applications. -This is Bootstrap 3. For Bootstrap 4 use the [Bootstrap Ruby gem](http://github.com/twbs/bootstrap-rubygem) if you use Ruby, and the [main repo](http://github.com/twbs/bootstrap) otherwise. +This is Bootstrap **3**. For Bootstrap **4** use the [Bootstrap rubygem](https://github.com/twbs/bootstrap-rubygem) if you use Ruby, and the [main repo](https://github.com/twbs/bootstrap) otherwise. ## Installation 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). -* [npm / Node.js](#d-npm--nodejs). +* [Bower](#b-bower). +* [npm / Node.js](#c-npm--nodejs). ### a. Ruby on Rails `bootstrap-sass` is easy to drop into Rails with the asset pipeline. 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.6' -gem 'sass-rails', '>= 3.2' +gem 'bootstrap-sass', '~> 3.4.0' +gem 'sassc-rails', '>= 2.0.0' ``` `bundle install` and restart your server to make the files available through the pipeline. Import Bootstrap styles in `app/assets/stylesheets/application.scss`: @@ -49,10 +48,21 @@ Then, remove all the `*= require_self` and `*= require_tree .` statements from the sass file. Instead, use `@import` to import Sass files. Do not use `*= require` in Sass or your other stylesheets will not be [able to access][antirequire] the Bootstrap mixins or variables. +Bootstrap JavaScript depends on jQuery. +If you're using Rails 5.1+, add the `jquery-rails` gem to your Gemfile: + +```ruby +gem 'jquery-rails' +``` + +```console +$ bundle install +``` + Require Bootstrap Javascripts in `app/assets/javascripts/application.js`: ```js //= require jquery //= require bootstrap-sprockets @@ -99,54 +109,12 @@ #### Rails 3.2.x bootstrap-sass is no longer compatible with Rails 3. The latest version of bootstrap-sass compatible with Rails 3.2 is v3.1.1.0. -### b. Compass without Rails +### b. Bower -Install the gem: - -```console -$ gem install bootstrap-sass -``` - -If you have an existing Compass project: - -1. Require `bootstrap-sass` in `config.rb`: - - ```ruby - require 'bootstrap-sass' - ``` - -2. Install Bootstrap with: - - ```console - $ bundle exec compass install bootstrap -r bootstrap-sass - ``` - -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 -``` - -or, alternatively, if you're not using a Gemfile for your dependencies: - -```console -$ compass create my-new-project -r bootstrap-sass --using bootstrap -``` - -This will create a new Compass project with the following files in it: - -* [styles.sass](/templates/project/styles.sass) - main project Sass file, imports Bootstrap and variables. -* [_bootstrap-variables.sass](/templates/project/_bootstrap-variables.sass) - 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. Bower - bootstrap-sass Bower package is compatible with node-sass 3.2.0+. You can install it with: ```console $ bower install bootstrap-sass ``` @@ -174,11 +142,11 @@ //= require bootstrap-sprockets ``` See also this [example manifest.js](/test/dummy_node_mincer/manifest.js) for mincer. -### d. npm / Node.js +### c. npm / Node.js ```console $ npm install bootstrap-sass ``` @@ -199,23 +167,23 @@ ### Sass: Number Precision bootstrap-sass [requires](https://github.com/twbs/bootstrap-sass/issues/409) minimum [Sass number precision][sass-precision] of 8 (default is 5). -Precision is set for Rails and Compass automatically. -When using Ruby Sass compiler standalone or with the Bower version you can set it with: +Precision is set for Ruby automatically when using the `sassc-rails` gem. +When using the npm or Bower version with Ruby, you can set it with: ```ruby ::Sass::Script::Value::Number.precision = [8, ::Sass::Script::Value::Number.precision].max ``` ### Sass: Autoprefixer Bootstrap requires the use of [Autoprefixer][autoprefixer]. -[Autoprefixer][autoprefixer] adds vendor prefixes to CSS rules using values from [Can I Use](http://caniuse.com/). +[Autoprefixer][autoprefixer] adds vendor prefixes to CSS rules using values from [Can I Use](https://caniuse.com/). -To match [upstream Bootstrap's level of browser compatibility](http://getbootstrap.com/getting-started/#support), set Autoprefixer's `browsers` option to: +To match [upstream Bootstrap's level of browser compatibility](https://getbootstrap.com/getting-started/#support), set Autoprefixer's `browsers` option to: ```json [ "Android 2.3", "Android >= 4", "Chrome >= 20", @@ -282,11 +250,11 @@ ```scss @import "bootstrap/theme"; ``` -The full list of Bootstrap variables can be found [here](http://getbootstrap.com/customize/#less-variables). You can override these by simply redefining the variable before the `@import` directive, e.g.: +The full list of Bootstrap variables can be found [here](https://getbootstrap.com/customize/#less-variables). You can override these by simply redefining the variable before the `@import` directive, e.g.: ```scss $navbar-default-bg: #312312; $light-orange: #ff8c00; $navbar-default-color: $light-orange; @@ -311,11 +279,11 @@ ``` ## Version Bootstrap for Sass version may differ from the upstream version in the last number, known as -[PATCH](http://semver.org/spec/v2.0.0.html). The patch version may be ahead of the corresponding upstream minor. +[PATCH](https://semver.org/spec/v2.0.0.html). The patch version may be ahead of the corresponding upstream minor. This happens when we need to release Sass-specific changes. Before v3.3.2, Bootstrap for Sass version used to reflect the upstream version, with an additional number for Sass-specific changes. This was changed due to Bower and npm compatibility issues. @@ -382,9 +350,9 @@ [converter]: https://github.com/twbs/bootstrap-sass/blob/master/tasks/converter/less_conversion.rb [version]: https://github.com/twbs/bootstrap-sass/blob/master/lib/bootstrap-sass/version.rb [contrib]: https://github.com/twbs/bootstrap-sass/graphs/contributors [antirequire]: https://github.com/twbs/bootstrap-sass/issues/79#issuecomment-4428595 -[jsdocs]: http://getbootstrap.com/javascript/#transitions +[jsdocs]: https://getbootstrap.com/javascript/#transitions [sass-precision]: http://sass-lang.com/documentation/Sass/Script/Value/Number.html#precision%3D-class_method [mincer]: https://github.com/nodeca/mincer [autoprefixer]: https://github.com/postcss/autoprefixer