From 8776e80ffab945772a6f3442521117e1abe7c3c5 Mon Sep 17 00:00:00 2001 From: Giovanni Totaro Date: Mon, 30 Oct 2017 12:24:39 +0100 Subject: [PATCH 1/2] Explain contents of bundled JS files in docs (#23735) --- README.md | 2 +- docs/4.0/getting-started/contents.md | 32 +++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0a79e97330..657183c598 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ bootstrap/ └── bootstrap.min.js ``` -We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developers.google.com/web/tools/chrome-devtools/debug/readability/source-maps) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. +We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developers.google.com/web/tools/chrome-devtools/debug/readability/source-maps) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. Bundled JS files (`bootstrap.bundle.js` and minified `bootstrap.bundle.min.js`) include [Popper](https://popper.js.org), but not [jQuery](https://jquery.com). ## Bugs and feature requests diff --git a/docs/4.0/getting-started/contents.md b/docs/4.0/getting-started/contents.md index 975f29a0ab..af99c696cd 100644 --- a/docs/4.0/getting-started/contents.md +++ b/docs/4.0/getting-started/contents.md @@ -34,7 +34,7 @@ bootstrap/ └── bootstrap.min.js {% endhighlight %} -This is the most basic form of Bootstrap: precompiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developers.google.com/web/tools/chrome-devtools/javascript/source-maps) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. +This is the most basic form of Bootstrap: precompiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developers.google.com/web/tools/chrome-devtools/javascript/source-maps) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. Bundled JS files (`bootstrap.bundle.js` and minified `bootstrap.bundle.min.js`) include [Popper](https://popper.js.org), but not [jQuery](https://jquery.com). ### Comparison of CSS files @@ -82,6 +82,36 @@ This is the most basic form of Bootstrap: precompiled files for quick drop-in us +### Comparison of JS files + + + + + + + + + + + + + + + + + + + + + +
JS filesPopperjQuery
+
bootstrap.bundle.js
+
bootstrap.bundle.min.js
+ 		IncludedNot included
+
bootstrap.js
+
bootstrap.min.js
+ 		Not includedNot included
+ ## Bootstrap source code The Bootstrap source code download includes the precompiled CSS and JavaScript assets, along with source Sass, JavaScript, and documentation. More specifically, it includes the following and more: From a1e2a2763240ec0220984d37c2f7b154a9160ba1 Mon Sep 17 00:00:00 2001 From: Giovanni Totaro Date: Mon, 30 Oct 2017 17:42:41 +0100 Subject: [PATCH 2/2] Add missing trailing slashes to URLs in docs --- README.md | 2 +- docs/4.0/getting-started/contents.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 657183c598..f8f60a1308 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ bootstrap/ └── bootstrap.min.js ``` -We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developers.google.com/web/tools/chrome-devtools/debug/readability/source-maps) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. Bundled JS files (`bootstrap.bundle.js` and minified `bootstrap.bundle.min.js`) include [Popper](https://popper.js.org), but not [jQuery](https://jquery.com). +We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developers.google.com/web/tools/chrome-devtools/debug/readability/source-maps) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. Bundled JS files (`bootstrap.bundle.js` and minified `bootstrap.bundle.min.js`) include [Popper](https://popper.js.org/), but not [jQuery](https://jquery.com/). ## Bugs and feature requests diff --git a/docs/4.0/getting-started/contents.md b/docs/4.0/getting-started/contents.md index af99c696cd..798324bd92 100644 --- a/docs/4.0/getting-started/contents.md +++ b/docs/4.0/getting-started/contents.md @@ -34,7 +34,7 @@ bootstrap/ └── bootstrap.min.js {% endhighlight %} -This is the most basic form of Bootstrap: precompiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developers.google.com/web/tools/chrome-devtools/javascript/source-maps) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. Bundled JS files (`bootstrap.bundle.js` and minified `bootstrap.bundle.min.js`) include [Popper](https://popper.js.org), but not [jQuery](https://jquery.com). +This is the most basic form of Bootstrap: precompiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developers.google.com/web/tools/chrome-devtools/javascript/source-maps) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. Bundled JS files (`bootstrap.bundle.js` and minified `bootstrap.bundle.min.js`) include [Popper](https://popper.js.org/), but not [jQuery](https://jquery.com/). ### Comparison of CSS files