diff --git a/docs/4.0/components/list-group.md b/docs/4.0/components/list-group.md index 1110eadd..90b6a47c 100755 --- a/docs/4.0/components/list-group.md +++ b/docs/4.0/components/list-group.md @@ -177,7 +177,7 @@ Add nearly any HTML within, even for linked list groups like the one below, with ## JavaScript behavior -Use the tab JavaScript plugin—include it individually or through the compiled `bootstrap.js` file—to extend our list group to create tabbable panes of local content. +Use the tab JavaScript plugin—include it individually or through the compiled `bootstrap-material-design.js` file—to extend our list group to create tabbable panes of local content.
diff --git a/docs/4.0/components/navs.md b/docs/4.0/components/navs.md index 5c750d8a..31e8c665 100755 --- a/docs/4.0/components/navs.md +++ b/docs/4.0/components/navs.md @@ -295,7 +295,7 @@ Add dropdown menus with a little extra HTML and the [dropdowns JavaScript plugin ## JavaScript behavior -Use the tab JavaScript plugin—include it individually or through the compiled `bootstrap.js` file—to extend our navigational tabs and pills to create tabbable panes of local content, even via dropdown menus. +Use the tab JavaScript plugin—include it individually or through the compiled `bootstrap-material-design.js` file—to extend our navigational tabs and pills to create tabbable panes of local content, even via dropdown menus. If you're building our JavaScript from source, it [requires `util.js`]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/javascript/#util). diff --git a/docs/4.0/components/popovers.md b/docs/4.0/components/popovers.md index fef7bd96..6d1fbf1c 100755 --- a/docs/4.0/components/popovers.md +++ b/docs/4.0/components/popovers.md @@ -10,7 +10,7 @@ toc: true Things to know when using the popover plugin: -- Popovers rely on the 3rd party library [Popper.js](https://popper.js.org/) for positioning. You must include [popper.min.js]({{ site.cdn.popper }}) before bootstrap.js or use `bootstrap.bundle.min.js` / `bootstrap.bundle.js` which contains Popper.js in order for popovers to work! +- Popovers rely on the 3rd party library [Popper.js](https://popper.js.org/) for positioning. You must include [popper.min.js]({{ site.cdn.popper }}) before bootstrap-material-design.js or use `bootstrap.bundle.min.js` / `bootstrap.bundle.js` which contains Popper.js in order for popovers to work! - Popovers require the [tooltip plugin]({{ site.baseurl }}/docs/{{ site.docs_version }}/components/tooltips/) as a dependency. - If you're building our JavaScript from source, it [requires `util.js`]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/javascript/#util). - Popovers are opt-in for performance reasons, so **you must initialize them yourself**. diff --git a/docs/4.0/components/tooltips.md b/docs/4.0/components/tooltips.md index a055d951..1dbd95b4 100755 --- a/docs/4.0/components/tooltips.md +++ b/docs/4.0/components/tooltips.md @@ -10,7 +10,7 @@ toc: true Things to know when using the tooltip plugin: -- Tooltips rely on the 3rd party library [Popper.js](https://popper.js.org/) for positioning. You must include [popper.min.js]({{ site.cdn.popper }}) before bootstrap.js or use `bootstrap.bundle.min.js` / `bootstrap.bundle.js` which contains Popper.js in order for tooltips to work! +- Tooltips rely on the 3rd party library [Popper.js](https://popper.js.org/) for positioning. You must include [popper.min.js]({{ site.cdn.popper }}) before bootstrap-material-design.js or use `bootstrap.bundle.min.js` / `bootstrap.bundle.js` which contains Popper.js in order for tooltips to work! - If you're building our JavaScript from source, it [requires `util.js`]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/javascript/#util). - Tooltips are opt-in for performance reasons, so **you must initialize them yourself**. - Tooltips with zero-length titles are never displayed. diff --git a/docs/4.0/examples/album/index.html b/docs/4.0/examples/album/index.html index ac765aaa..77ade84d 100755 --- a/docs/4.0/examples/album/index.html +++ b/docs/4.0/examples/album/index.html @@ -10,7 +10,7 @@ Album example for Bootstrap - + @@ -226,7 +226,7 @@ - + diff --git a/docs/4.0/examples/blog/index.html b/docs/4.0/examples/blog/index.html index d5f9cfe5..e4c39838 100755 --- a/docs/4.0/examples/blog/index.html +++ b/docs/4.0/examples/blog/index.html @@ -10,7 +10,7 @@ Blog Template for Bootstrap - + @@ -218,7 +218,7 @@ - + - + diff --git a/docs/4.0/examples/checkout/index.html b/docs/4.0/examples/checkout/index.html index e8037708..47812665 100755 --- a/docs/4.0/examples/checkout/index.html +++ b/docs/4.0/examples/checkout/index.html @@ -10,7 +10,7 @@ Checkout example for Bootstrap - + @@ -240,7 +240,7 @@ - + - + diff --git a/docs/4.0/examples/dashboard/index.html b/docs/4.0/examples/dashboard/index.html index d5df44f8..95ac1267 100755 --- a/docs/4.0/examples/dashboard/index.html +++ b/docs/4.0/examples/dashboard/index.html @@ -10,7 +10,7 @@ Dashboard Template for Bootstrap - + @@ -260,7 +260,7 @@ - + diff --git a/docs/4.0/examples/floating-labels/index.html b/docs/4.0/examples/floating-labels/index.html index ebe38f37..7cbe4f89 100755 --- a/docs/4.0/examples/floating-labels/index.html +++ b/docs/4.0/examples/floating-labels/index.html @@ -10,7 +10,7 @@ Floating labels example for Bootstrap - + diff --git a/docs/4.0/examples/grid/index.html b/docs/4.0/examples/grid/index.html index 0be50f81..68ea02ad 100755 --- a/docs/4.0/examples/grid/index.html +++ b/docs/4.0/examples/grid/index.html @@ -10,7 +10,7 @@ Grid Template for Bootstrap - + diff --git a/docs/4.0/examples/jumbotron/index.html b/docs/4.0/examples/jumbotron/index.html index 5499cc63..54a71190 100755 --- a/docs/4.0/examples/jumbotron/index.html +++ b/docs/4.0/examples/jumbotron/index.html @@ -10,7 +10,7 @@ Jumbotron Template for Bootstrap - + @@ -98,6 +98,6 @@ - + diff --git a/docs/4.0/examples/navbar-bottom/index.html b/docs/4.0/examples/navbar-bottom/index.html index 539e739d..2009a291 100755 --- a/docs/4.0/examples/navbar-bottom/index.html +++ b/docs/4.0/examples/navbar-bottom/index.html @@ -10,7 +10,7 @@ Bottom navbar example for Bootstrap - + @@ -55,6 +55,6 @@ - + diff --git a/docs/4.0/examples/navbar-fixed/index.html b/docs/4.0/examples/navbar-fixed/index.html index 1c5196ff..c71e4caa 100755 --- a/docs/4.0/examples/navbar-fixed/index.html +++ b/docs/4.0/examples/navbar-fixed/index.html @@ -10,7 +10,7 @@ Fixed top navbar example for Bootstrap - + @@ -56,6 +56,6 @@ - + diff --git a/docs/4.0/examples/navbar-static/index.html b/docs/4.0/examples/navbar-static/index.html index c1eebd71..8820519e 100755 --- a/docs/4.0/examples/navbar-static/index.html +++ b/docs/4.0/examples/navbar-static/index.html @@ -10,7 +10,7 @@ Top navbar example for Bootstrap - + @@ -56,6 +56,6 @@ - + diff --git a/docs/4.0/examples/navbars/index.html b/docs/4.0/examples/navbars/index.html index 95aaa92c..4a1906d3 100755 --- a/docs/4.0/examples/navbars/index.html +++ b/docs/4.0/examples/navbars/index.html @@ -10,7 +10,7 @@ Navbar Template for Bootstrap - + @@ -342,6 +342,6 @@ - + diff --git a/docs/4.0/examples/offcanvas/index.html b/docs/4.0/examples/offcanvas/index.html index eb85d104..f1e7e7a2 100755 --- a/docs/4.0/examples/offcanvas/index.html +++ b/docs/4.0/examples/offcanvas/index.html @@ -10,7 +10,7 @@ Offcanvas template for Bootstrap - + @@ -152,7 +152,7 @@ - + diff --git a/docs/4.0/examples/pricing/index.html b/docs/4.0/examples/pricing/index.html index 36fae88d..019d2f59 100755 --- a/docs/4.0/examples/pricing/index.html +++ b/docs/4.0/examples/pricing/index.html @@ -10,7 +10,7 @@ Pricing example for Bootstrap - + @@ -129,7 +129,7 @@ - + - + - + diff --git a/docs/4.0/examples/sticky-footer-navbar/index.html b/docs/4.0/examples/sticky-footer-navbar/index.html index 166c5452..13240fcb 100755 --- a/docs/4.0/examples/sticky-footer-navbar/index.html +++ b/docs/4.0/examples/sticky-footer-navbar/index.html @@ -10,7 +10,7 @@ Sticky Footer Navbar Template for Bootstrap - + @@ -64,6 +64,6 @@ - + diff --git a/docs/4.0/examples/sticky-footer/index.html b/docs/4.0/examples/sticky-footer/index.html index e00111c4..6efc7c75 100755 --- a/docs/4.0/examples/sticky-footer/index.html +++ b/docs/4.0/examples/sticky-footer/index.html @@ -10,7 +10,7 @@ Sticky Footer Template for Bootstrap - + diff --git a/docs/4.0/examples/tooltip-viewport/index.html b/docs/4.0/examples/tooltip-viewport/index.html index dae90015..cd84db10 100755 --- a/docs/4.0/examples/tooltip-viewport/index.html +++ b/docs/4.0/examples/tooltip-viewport/index.html @@ -10,7 +10,7 @@ Tooltip Viewport Example for Bootstrap - + @@ -39,7 +39,7 @@ - + diff --git a/docs/4.0/getting-started/contents.md b/docs/4.0/getting-started/contents.md index c95549f0..9a0c9fb9 100755 --- a/docs/4.0/getting-started/contents.md +++ b/docs/4.0/getting-started/contents.md @@ -15,10 +15,10 @@ Once downloaded, unzip the compressed folder and you'll see something like this: {% highlight plaintext %} bootstrap/ ├── css/ -│ ├── bootstrap.css -│ ├── bootstrap.css.map -│ ├── bootstrap.min.css -│ ├── bootstrap.min.css.map +│ ├── bootstrap-material-design.css +│ ├── bootstrap-material-design.css.map +│ ├── bootstrap-material-design.min.css +│ ├── bootstrap-material-design.min.css.map │ ├── bootstrap-grid.css │ ├── bootstrap-grid.css.map │ ├── bootstrap-grid.min.css @@ -30,8 +30,8 @@ bootstrap/ └── js/ ├── bootstrap.bundle.js ├── bootstrap.bundle.min.js - ├── bootstrap.js - └── bootstrap.min.js + ├── bootstrap-material-design.js + └── bootstrap-material-design.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/). @@ -53,8 +53,8 @@ Bootstrap includes a handful of options for including some or all of our compile -
bootstrap.css
-
bootstrap.min.css
+
bootstrap-material-design.css
+
bootstrap-material-design.min.css
Included Included @@ -107,8 +107,8 @@ Similarly, we have options for including some or all of our compiled JavaScript. -
bootstrap.js
-
bootstrap.min.js
+
bootstrap-material-design.js
+
bootstrap-material-design.min.js
Not included Not included diff --git a/docs/4.0/getting-started/javascript.md b/docs/4.0/getting-started/javascript.md index d955534c..26b1aad7 100755 --- a/docs/4.0/getting-started/javascript.md +++ b/docs/4.0/getting-started/javascript.md @@ -8,7 +8,7 @@ toc: true ## Individual or compiled -Plugins can be included individually (using Bootstrap's individual `*.js` files), or all at once using `bootstrap.js` or the minified `bootstrap.min.js` (don't include both). +Plugins can be included individually (using Bootstrap's individual `*.js` files), or all at once using `bootstrap-material-design.js` or the minified `bootstrap-material-design.min.js` (don't include both). ## Dependencies @@ -127,7 +127,7 @@ Bootstrap's plugins don't fall back particularly gracefully when JavaScript is d ## Util -All Bootstrap's JavaScript files depend on `util.js` and it has to be included alongside the other JavaScript files. If you're using the compiled (or minified) `bootstrap.js`, there is no need to include this—it's already there. +All Bootstrap's JavaScript files depend on `util.js` and it has to be included alongside the other JavaScript files. If you're using the compiled (or minified) `bootstrap-material-design.js`, there is no need to include this—it's already there. `util.js` includes utility functions and a basic helper for `transitionEnd` events as well as a CSS transition emulator. It's used by the other plugins to check for CSS transition support and to catch hanging transitions. diff --git a/docs/4.0/getting-started/webpack.md b/docs/4.0/getting-started/webpack.md index 70b44b61..807cb4dd 100755 --- a/docs/4.0/getting-started/webpack.md +++ b/docs/4.0/getting-started/webpack.md @@ -79,7 +79,7 @@ For Bootstrap to compile, make sure you install and use the required loaders: [s Alternatively, you may use Bootstrap's ready-to-use css by simply adding this line to your project's entry point: {% highlight js %} -import 'bootstrap/dist/css/bootstrap.min.css'; +import 'bootstrap/dist/css/bootstrap-material-design.min.css'; {% endhighlight %} In this case you may use your existing rule for `css` without any special modifications to webpack config except you don't need `sass-loader` just [style-loader](https://github.com/webpack-contrib/style-loader) and [css-loader](https://github.com/webpack-contrib/css-loader).