diff options
| author | Mark Otto <[email protected]> | 2017-06-18 18:32:42 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-06-18 18:32:42 -0700 |
| commit | 222eddda5e8308b2b32f44f698bbf1b35ebb476a (patch) | |
| tree | 0e92e5a2c010157c841c243f708deadfa4b0f55e /docs/4.0 | |
| parent | 1a23321fc01ee58b1ea1a20ec32ae2146177ffc8 (diff) | |
| parent | 16d77b4cb07f575d45ae486125ea9df06bd45d3f (diff) | |
| download | bootstrap-222eddda5e8308b2b32f44f698bbf1b35ebb476a.tar.xz bootstrap-222eddda5e8308b2b32f44f698bbf1b35ebb476a.zip | |
Merge branch 'v4-dev' into colors-redux
Diffstat (limited to 'docs/4.0')
| -rw-r--r-- | docs/4.0/getting-started/download.md | 4 | ||||
| -rw-r--r-- | docs/4.0/getting-started/webpack.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/4.0/getting-started/download.md b/docs/4.0/getting-started/download.md index b3338f6ba..468575494 100644 --- a/docs/4.0/getting-started/download.md +++ b/docs/4.0/getting-started/download.md @@ -15,7 +15,7 @@ toc: true <a href="{{ site.download.dist }}" class="btn btn-bd-purple" onclick="ga('send', 'event', 'Getting started', 'Download', 'Download Bootstrap');">Download Bootstrap</a> ## Source files -**Want to compile Bootstrap with your project's asset pipeline?** Choose this option to download our source Sass, JavaScript, and documentation files. Requires a Sass compiler, [Autoprefixer](https://github.com/postcss/autoprefixer), [postcss-flexbugs-fixes](https://github.com/luisrudge/postcss-flexbugs-fixes), and [some setup]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/build-tools/#tooling-setup). +**Want to compile Bootstrap with your project's asset pipeline?** Choose this option to download our source Sass, JavaScript, and documentation files. Requires a Sass compiler, [Autoprefixer](https://github.com/postcss/autoprefixer), and [some setup]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/build-tools/#tooling-setup). <a href="{{ site.download.source }}" class="btn btn-bd-purple" onclick="ga('send', 'event', 'Getting started', 'Download', 'Download source');">Download source</a> @@ -30,7 +30,7 @@ Skip the download and use the Bootstrap CDN to deliver Bootstrap's compiled CSS ## Package managers -Pull in Bootstrap's **source files** into nearly any project with some of the most popular package managers. No matter the package manager, Bootstrap will **require a Sass compiler, [Autoprefixer](https://github.com/postcss/autoprefixer), and [postcss-flexbugs-fixes](https://github.com/luisrudge/postcss-flexbugs-fixes)** for a setup that matches our official compiled versions. +Pull in Bootstrap's **source files** into nearly any project with some of the most popular package managers. No matter the package manager, Bootstrap will **require a Sass compiler and [Autoprefixer](https://github.com/postcss/autoprefixer)** for a setup that matches our official compiled versions. ### npm diff --git a/docs/4.0/getting-started/webpack.md b/docs/4.0/getting-started/webpack.md index dd246e045..b22fad36d 100644 --- a/docs/4.0/getting-started/webpack.md +++ b/docs/4.0/getting-started/webpack.md @@ -61,7 +61,7 @@ First, create your own `_custom.scss` and use it to override the [built-in custo @import "~bootstrap/scss/bootstrap"; {% endhighlight %} -For Bootstrap to compile, make sure you install and use the required loaders: [sass-loader](https://github.com/webpack-contrib/sass-loader), [postcss-loader](https://github.com/postcss/postcss-loader) with [Autoprefixer](https://github.com/postcss/autoprefixer#webpack) and [postcss-flexbugs-fixes](https://github.com/luisrudge/postcss-flexbugs-fixes). With minimal setup, your webpack config should include this rule or similar: +For Bootstrap to compile, make sure you install and use the required loaders: [sass-loader](https://github.com/webpack-contrib/sass-loader), [postcss-loader](https://github.com/postcss/postcss-loader) with [Autoprefixer](https://github.com/postcss/autoprefixer#webpack). With minimal setup, your webpack config should include this rule or similar: {% highlight js %} ... |
