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>2017-05-29 16:50:53 +0300
committerGleb Mazovetskiy <glex.spb@gmail.com>2017-05-29 16:54:51 +0300
commit8927eff0d7779cedd4fe773a9b8b5b7174d065c6 (patch)
tree406eaa3164458f4ccd81d363877ddb42c6e05ca5 /README.md
parentf4ff7cc4b2d71c54d8809f546d2fd239e0016baf (diff)
Promote Popper.js to gem dependency
Diffstat (limited to 'README.md')
-rw-r--r--README.md36
1 files changed, 16 insertions, 20 deletions
diff --git a/README.md b/README.md
index 6f8ad45..f44cf21 100644
--- a/README.md
+++ b/README.md
@@ -44,37 +44,33 @@ Then, remove all the `*= require` and `*= require_tree` statements from the Sass
Do not use `*= require` in Sass or your other stylesheets will not be able to access the Bootstrap mixins and variables.
-If you're using Rails 5.1+, you'll need to add the jquery gem to your Gemfile:
-```
+Bootstrap JavaScript depends on jQuery.
+If you're using Rails 5.1+, add the `jquery-rails` gem to your Gemfile:
+
+```ruby
gem 'jquery-rails'
```
-And you will need to include jquery into application.js:
-```js
-//= require jquery
-//= require bootstrap-sprockets
-```
+Bootstrap tooltips and popovers depend on [popper.js] for positioning.
+The `bootstrap` gem already depends on the
+[popper_js](https://github.com/glebm/popper_js-rubygem) gem.
-While `bootstrap-sprockets` provides individual Bootstrap components for ease of debugging, you may alternatively require the concatenated `bootstrap` for faster compilation:
+Add Bootstrap dependencies and Bootstrap to your `application.js`:
```js
-//= require jquery
-//= require bootstrap
-```
-
-Tooltips and popovers depend on [popper.js] for positioning.
-If you use them, add popper.js to the Gemfile:
-
-```ruby
-gem 'popper_js', '>= 1.9.9'
+//= require jquery3
+//= require popper
+//= require bootstrap-sprockets
```
-Then, run `bundle`, restart the server, and require popper before bootstrap but after jQuery:
+While `bootstrap-sprockets` provides individual Bootstrap components
+for ease of debugging, you may alternatively require
+the concatenated `bootstrap` for faster compilation:
```js
-//= require jquery
+//= require jquery3
//= require popper
-//= require bootstrap-sprockets
+//= require bootstrap
```
### b. Compass without Rails