Merge branch 'master' into master-xmr-actions-split

.dependabot/config.yml

@@ -13,7 +13,8 @@ update_configs:
     default_labels:
       - "dependencies"
       - "v5"
+    version_requirement_updates: "increase_versions"
     ignored_updates:
       - match:
           dependency_name: "karma-browserstack-launcher"
-          version_requirement: "> 1.4.0 < 1.5.2"
+          version_requirement: "1.5.1"

package.json

@@ -102,13 +102,13 @@
     "eslint-config-xo": "^0.27.1",
     "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-unicorn": "^12.1.0",
-    "find-unused-sass-variables": "^0.6.0",
-    "glob": "^7.1.4",
+    "find-unused-sass-variables": "^1.0.2",
+    "glob": "^7.1.5",
     "hammer-simulator": "0.0.1",
-    "hugo-bin": "^0.46.3",
+    "hugo-bin": "^0.47.0",
     "ip": "^1.1.5",
     "jasmine-core": "^3.5.0",
-    "karma": "^4.3.0",
+    "karma": "^4.4.1",
     "karma-browserstack-launcher": "1.4.0",
     "karma-chrome-launcher": "^3.1.0",
     "karma-coverage-istanbul-reporter": "^2.1.0",
@@ -123,7 +123,7 @@
     "npm-run-all": "^4.1.5",
     "popper.js": "^1.16.0",
     "postcss-cli": "^6.1.3",
-    "rollup": "^1.23.1",
+    "rollup": "^1.25.1",
     "rollup-plugin-babel": "^4.3.3",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-istanbul": "^2.0.1",
@@ -132,7 +132,7 @@
     "shelljs": "^0.8.3",
     "shx": "^0.3.2",
     "stylelint": "^11.1.1",
-    "stylelint-config-twbs-bootstrap": "^0.6.0",
+    "stylelint-config-twbs-bootstrap": "^0.7.0",
     "terser": "^4.3.8",
     "vnu-jar": "19.9.4"
   },

site/content/docs/4.3/components/alerts.md

@@ -11,7 +11,7 @@ toc: true
 
 ## Examples
 
-Alerts are available for any length of text, as well as an optional dismiss button. For proper styling, use one of the eight **required** contextual classes (e.g., `.alert-success`). For inline dismissal, use the [alerts JavaScript plugin](#dismissing).
+Alerts are available for any length of text, as well as an optional close button. For proper styling, use one of the eight **required** contextual classes (e.g., `.alert-success`). For inline dismissal, use the [alerts JavaScript plugin](#dismissing).
 
 {{< example >}}
 {{< alerts.inline >}}
@@ -58,8 +58,8 @@ Alerts can also contain additional HTML elements like headings, paragraphs and d
 Using the alert JavaScript plugin, it's possible to dismiss any alert inline. Here's how:
 
 - Be sure you've loaded the alert plugin, or the compiled Bootstrap JavaScript.
-- Add a dismiss button and the `.alert-dismissible` class, which adds extra padding to the right of the alert and positions the `.close` button.
-- On the dismiss button, add the `data-dismiss="alert"` attribute, which triggers the JavaScript functionality. Be sure to use the `<button>` element with it for proper behavior across all devices.
+- Add a [close button]({{< docsref "/components/close-button" >}}) and the `.alert-dismissible` class, which adds extra padding to the right of the alert and positions the close button.
+- On the close button, add the `data-dismiss="alert"` attribute, which triggers the JavaScript functionality. Be sure to use the `<button>` element with it for proper behavior across all devices.
 - To animate alerts when dismissing them, be sure to add the `.fade` and `.show` classes.
 
 You can see this in action with a live demo:

site/content/docs/4.3/components/close-icon.md → site/content/docs/4.3/components/close-button.md

@@ -1,7 +1,7 @@
 ---
 layout: docs
-title: Close icon
-description: Use a generic close icon for dismissing content like modals and alerts.
+title: Close button
+description: A generic close button for dismissing content like modals and alerts.
 group: components
 ---