Merge remote-tracking branch 'refs/remotes/twbs/v4-dev' into v4-dev

7 files changed, 11 insertions, 11 deletions

diff --git a/docs/4.0/components/card.md b/docs/4.0/components/card.md
index 9db9bc3c9..5da0ef039 100644
--- a/docs/4.0/components/card.md
+++ b/docs/4.0/components/card.md
@@ -47,7 +47,7 @@ The building block of a card is the `.card-body`. Use it whenever you need a pad
 
 ### Titles, text, and links
 
-Card titles are used by adding `.card-title` to a `<h*>` tag. In the same way, links are added and placed next to each other by adding `.card-link` to  a `<a>` tag.
+Card titles are used by adding `.card-title` to a `<h*>` tag. In the same way, links are added and placed next to each other by adding `.card-link` to an `<a>` tag.
 
 Subtitles are used by adding a `.card-subtitle` to a `<h*>` tag. If the `.card-title` and the `.card-subtitle` items are placed in a `.card-body` item, the card title and subtitle are aligned nicely.
 
diff --git a/docs/4.0/components/collapse.md b/docs/4.0/components/collapse.md
index 536cc177f..a34ffeb7b 100644
--- a/docs/4.0/components/collapse.md
+++ b/docs/4.0/components/collapse.md
@@ -35,7 +35,7 @@ You can use a link with the `href` attribute, or a button with the `data-target`
 ## Multiple targets
 
 A `<button>` or `<a>` can show and hide multiple elements by referencing them with a JQuery selector in its `href` or `data-target` attribute.
-Multiple `<button>` or `<a>` can  show and hide an element if they each reference it with their `href` or `data-target` attribute
+Multiple `<button>` or `<a>` can show and hide an element if they each reference it with their `href` or `data-target` attribute
 
 {% example html %}
 <p>
diff --git a/docs/4.0/components/list-group.md b/docs/4.0/components/list-group.md
index 1a2796588..2d5b4f16e 100644
--- a/docs/4.0/components/list-group.md
+++ b/docs/4.0/components/list-group.md
@@ -217,7 +217,7 @@ Use the tab JavaScript plugin—include it individually or through the compiled
 
 ### Using data attributes
 
-You can activate a list group navigation without writing any JavaScript by simply specifying `data-toggle="list"` or  on an element. Use these data attributes on `.list-group-item`.
+You can activate a list group navigation without writing any JavaScript by simply specifying `data-toggle="list"` or on an element. Use these data attributes on `.list-group-item`.
 
 <div role="tabpanel">
 {% highlight html %}
diff --git a/docs/4.0/content/images.md b/docs/4.0/content/images.md
index 4601dcc6d..5c8e19470 100644
--- a/docs/4.0/content/images.md
+++ b/docs/4.0/content/images.md
@@ -77,7 +77,7 @@ If you are using the `<picture>` element to specify multiple `<source>` elements
 
 {% highlight html %}
 ​<picture>
- <source srcset="..." type="image/svg+xml">
- <img src="..."  class="img-fluid img-thumbnail" alt="...">
+  <source srcset="..." type="image/svg+xml">
+  <img src="..." class="img-fluid img-thumbnail" alt="...">
 </picture>
 {% endhighlight %}
diff --git a/docs/4.0/examples/dashboard/index.html b/docs/4.0/examples/dashboard/index.html
index ece8fd595..b200fb7b2 100644
--- a/docs/4.0/examples/dashboard/index.html
+++ b/docs/4.0/examples/dashboard/index.html
@@ -93,7 +93,7 @@
           </ul>
         </nav>
 
-        <main  role="main" class="col-sm-9 ml-sm-auto col-md-10 pt-3">
+        <main role="main" class="col-sm-9 ml-sm-auto col-md-10 pt-3">
           <h1>Dashboard</h1>
 
           <section class="row text-center placeholders">
diff --git a/docs/4.0/utilities/vertical-align.md b/docs/4.0/utilities/vertical-align.md
index 3bb4fb851..2b246eb31 100644
--- a/docs/4.0/utilities/vertical-align.md
+++ b/docs/4.0/utilities/vertical-align.md
@@ -7,7 +7,7 @@ group: utilities
 
 Change the alignment of elements with the [`vertical-alignment`](https://developer.mozilla.org/en-US/docs/Web/CSS/vertical-align) utilities. Please note that vertical-align only affects inline, inline-block, inline-table, and table cell elements.
 
-Choose from  `.align-baseline`, `.align-top`, `.align-middle`, `.align-bottom`, `.align-text-bottom`, and `.align-text-top` as needed.
+Choose from `.align-baseline`, `.align-top`, `.align-middle`, `.align-bottom`, `.align-text-bottom`, and `.align-text-top` as needed.
 
 With inline elements:
 
diff --git a/package.json b/package.json
index 3a123a78e..0b4958ff5 100644
--- a/package.json
+++ b/package.json
@@ -24,9 +24,9 @@
     "css-docs": "npm-run-all --parallel css-lint-docs css-compile-docs --sequential css-prefix-docs css-minify-docs",
     "css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css",
     "css-compile-docs": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 assets/scss/docs.scss assets/css/docs.min.css",
-    "css-lint": "stylelint --config build/.stylelintrc --syntax scss scss/**/*.scss",
-    "css-lint-docs": "stylelint --config build/.stylelintrc --syntax scss assets/scss/*.scss",
-    "css-prefix": "postcss --config build/postcss.config.js --replace dist/css/*.css",
+    "css-lint": "stylelint --config build/.stylelintrc --syntax scss \"scss/**/*.scss\"",
+    "css-lint-docs": "stylelint --config build/.stylelintrc --syntax scss \"assets/scss/*.scss\"",
+    "css-prefix": "postcss --config build/postcss.config.js --replace \"dist/css/*.css\"",
     "css-prefix-docs": "postcss --config build/postcss.config.js --no-map --replace assets/css/docs.min.css",
     "css-minify": "cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css",
     "css-minify-docs": "cleancss --level 1 --source-map --source-map-inline-sources --output assets/css/docs.min.css assets/css/docs.min.css",
@@ -49,7 +49,7 @@
     "docs-compile": "bundle exec jekyll build",
     "postdocs-compile": "npm run docs-workbox-precache",
     "docs-github": "shx echo \"github: true\" > twbsconfig.yml && npm run docs-compile -- --config _config.yml,twbsconfig.yml && shx rm ./twbsconfig.yml",
-    "docs-lint": "htmllint --rc build/.htmllintrc _gh_pages/*.html _gh_pages/**/*.html js/tests/visual/*.html",
+    "docs-lint": "htmllint --rc build/.htmllintrc \"_gh_pages/**/*.html\" \"js/tests/**/*.html\"",
     "docs-serve": "bundle exec jekyll serve",
     "docs-upload-preview": "build/upload-preview.sh",
     "docs-workbox-precache": "node build/workbox.js",