Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-rubygem.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Mazovetskiy <glex.spb@gmail.com>2015-02-20 03:36:22 +0300
committerGleb Mazovetskiy <glex.spb@gmail.com>2015-02-20 03:36:22 +0300
commitd1dd1fb8b1c2ab3c4175adcda386cd973866f04d (patch)
tree2752a4cfef08c62d8f62446ca9842c05ea609591
parent1d355261013ad2537790af4b09a96fddbfca8545 (diff)
parentc2a4ebb98b988b2771012e4af4096b478cefe11a (diff)
Merge pull request #854 from shawnacscott/readme-js-info
Include Javascript require caveat in README per #829
-rw-r--r--README.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/README.md b/README.md
index 27c6353..4c42481 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,11 @@ Require Bootstrap Javascripts in `app/assets/javascripts/application.js`:
//= require bootstrap-sprockets
```
+`bootstrap-sprockets` and `bootstrap` [should not both be included](https://github.com/twbs/bootstrap-sass/issues/829#issuecomment-75153827) in `application.js`.
+
+`bootstrap-sprockets` provides individual Bootstrap Javascript files (`alert.js` or `dropdown.js`, for example), while
+`bootstrap` provides a concatenated file containing all Bootstrap Javascripts.
+
#### Bower with Rails
When using [bootstrap-sass Bower package](#c-bower) instead of the gem in Rails, configure assets in `config/application.rb`: