From 614593c379c7ccdfebf7d15cdf0fbb2c46eb9311 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 29 Sep 2020 21:42:22 -0700 Subject: WIP: Add dependencies to our Sass files --- site/docs/4.5/getting-started/download.md | 5 ++--- site/docs/4.5/getting-started/introduction.md | 31 ++++++--------------------- 2 files changed, 8 insertions(+), 28 deletions(-) (limited to 'site/docs') diff --git a/site/docs/4.5/getting-started/download.md b/site/docs/4.5/getting-started/download.md index 7e0cb4a1e..fc5b93819 100644 --- a/site/docs/4.5/getting-started/download.md +++ b/site/docs/4.5/getting-started/download.md @@ -40,15 +40,14 @@ Skip the download with [BootstrapCDN](https://www.bootstrapcdn.com/) to deliver {% highlight html %} - + {% endhighlight %} -If you're using our compiled JavaScript and prefer to include Popper.js separately, add Popper.js before our JS, via a CDN preferably. +If you're using our compiled JavaScript, don't forget to include jQuery and Popper.js, via a CDN preferably, before our JS. {% highlight html %} - {% endhighlight %} ## Package managers diff --git a/site/docs/4.5/getting-started/introduction.md b/site/docs/4.5/getting-started/introduction.md index 6e83611b1..c5e7ed07e 100644 --- a/site/docs/4.5/getting-started/introduction.md +++ b/site/docs/4.5/getting-started/introduction.md @@ -26,22 +26,9 @@ Copy-paste the stylesheet `` into your `` before all other styleshee ### JS -Many of our components require the use of JavaScript to function. Specifically, they require [jQuery](https://jquery.com/), [Popper.js](https://popper.js.org/), and our own JavaScript plugins. We use [jQuery's slim build](https://blog.jquery.com/2016/06/09/jquery-3-0-final-released/), but the full version is also supported. +Many of our components require the use of JavaScript to function. Specifically, they require [jQuery](https://jquery.com/), [Popper.js](https://popper.js.org/), and our own JavaScript plugins. Place the following ` - -{% endhighlight %} - -#### Separate - -If you decide to go with the separate scripts solution, Popper.js must come first, and then our JavaScript plugins. +We use [jQuery's slim build](https://blog.jquery.com/2016/06/09/jquery-3-0-final-released/), but the full version is also supported. {% highlight html %} @@ -49,9 +36,9 @@ If you decide to go with the separate scripts solution, Popper.js must come firs {% endhighlight %} -#### Components +Curious which components explicitly require jQuery, our JS, and Popper.js? Click the show components link below. If you're at all unsure about the general page structure, keep reading for an example page template. -Curious which components explicitly require jQuery, our JS, and Popper.js? Click the show components link below. If you're unsure about the page structure, keep reading for an example page template. +Our `bootstrap.bundle.js` and `bootstrap.bundle.min.js` include [Popper](https://popper.js.org/), but not [jQuery](https://jquery.com/). For more information about what's included in Bootstrap, please see our [contents]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/contents/#precompiled-bootstrap) section.
Show components requiring JavaScript @@ -90,17 +77,11 @@ Be sure to have your pages set up with the latest design and development standar

Hello, world!

- - - - - - - + - --> {% endhighlight %} -- cgit v1.2.3