diff options
| author | Mark Otto <[email protected]> | 2017-08-07 21:42:36 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-08-09 08:32:14 -0700 |
| commit | ba7d9217323e8f0ecf6d8548779cc399ac0f5c51 (patch) | |
| tree | a34c149ce4bce42da229af706d29eb049f71527c /docs | |
| parent | b21fc944b41c4d492b1c28cc89e51fcbcf4cf4b1 (diff) | |
| download | bootstrap-ba7d9217323e8f0ecf6d8548779cc399ac0f5c51.tar.xz bootstrap-ba7d9217323e8f0ecf6d8548779cc399ac0f5c51.zip | |
clarify optional js, add some links, emphasize some text
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/4.0/getting-started/introduction.md | 5 | ||||
| -rw-r--r-- | docs/4.0/getting-started/javascript.md | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/docs/4.0/getting-started/introduction.md b/docs/4.0/getting-started/introduction.md index 233c82883..b135326e7 100644 --- a/docs/4.0/getting-started/introduction.md +++ b/docs/4.0/getting-started/introduction.md @@ -24,7 +24,7 @@ Copy-paste the stylesheet `<link>` into your `<head>` before all other styleshee <link rel="stylesheet" href="{{ site.cdn.css }}" integrity="{{ site.cdn.css_hash }}" crossorigin="anonymous"> {% endhighlight %} -Add our JavaScript plugins, jQuery, and Popper.js near the end of your pages, right before the closing `</body>` tag. Be sure to place jQuery and Popper.js first, as our code depends on them. While we use [jQuery's slim build](https://blog.jquery.com/2016/06/09/jquery-3-0-final-released/) in our docs, the full version is also supported. +Add our optional JavaScript plugins, jQuery, and [Popper.js](https://github.com/FezVrasta/popper.js)) near the end of your pages, right before the closing `</body>` tag. Be sure to place jQuery and Popper.js first, as our JavaScript plugins depend on them. While we use [jQuery's slim build](https://blog.jquery.com/2016/06/09/jquery-3-0-final-released/) in our docs, the full version is also supported. {% highlight html %} <script src="{{ site.cdn.jquery }}" integrity="{{ site.cdn.jquery_hash }}" crossorigin="anonymous"></script> @@ -52,7 +52,8 @@ Be sure to have your pages set up with the latest design and development standar <body> <h1>Hello, world!</h1> - <!-- jQuery first, then Popper.js, then Bootstrap JS. --> + <!-- Optional JavaScript --> + <!-- jQuery first, then Popper.js, then Bootstrap JS --> <script src="{{ site.cdn.jquery }}" integrity="{{ site.cdn.jquery_hash }}" crossorigin="anonymous"></script> <script src="{{ site.cdn.popper }}" integrity="{{ site.cdn.popper_hash }}" crossorigin="anonymous"></script> <script src="{{ site.cdn.js }}" integrity="{{ site.cdn.js_hash }}" crossorigin="anonymous"></script> diff --git a/docs/4.0/getting-started/javascript.md b/docs/4.0/getting-started/javascript.md index c4fb2366a..003ebdb7b 100644 --- a/docs/4.0/getting-started/javascript.md +++ b/docs/4.0/getting-started/javascript.md @@ -1,7 +1,7 @@ --- layout: docs title: JavaScript -description: Bring Bootstrap to life with our JavaScript plugins built on jQuery. Learn about each plugin, our data and programmatic API options, and more. +description: Bring Bootstrap to life with our optional JavaScript plugins built on jQuery. Learn about each plugin, our data and programmatic API options, and more. group: getting-started toc: true --- @@ -12,7 +12,9 @@ Plugins can be included individually (using Bootstrap's individual `*.js` files) ## Dependencies -Some plugins and CSS components depend on other plugins. If you include plugins individually, make sure to check for these dependencies in the docs. Also note that all plugins depend on jQuery (this means jQuery must be included **before** the plugin files). [Consult our `bower.json`]({{ site.repo }}/blob/v{{ site.current_version }}/bower.json) to see which versions of jQuery are supported. +Some plugins and CSS components depend on other plugins. If you include plugins individually, make sure to check for these dependencies in the docs. Also note that **all plugins depend on jQuery** (this means jQuery must be included **before** the plugin files). [Consult our `bower.json`]({{ site.repo }}/blob/v{{ site.current_version }}/bower.json) to see which versions of jQuery are supported. + +Our tooltips and popovers also depend on [Popper.js](https://github.com/FezVrasta/popper.js). ## Data attributes |