aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShohei Yoshida <[email protected]>2019-10-22 11:27:43 +0900
committerMark Otto <[email protected]>2019-10-21 19:27:43 -0700
commit3b876be65273eb4e1096a7420f4b73767607fe59 (patch)
tree300cb362a774097d7deeb600d9ecb0e48f2396b4
parent3251de8d57b8e11b9dda0984298028cc977642eb (diff)
downloadbootstrap-3b876be65273eb4e1096a7420f4b73767607fe59.tar.xz
bootstrap-3b876be65273eb4e1096a7420f4b73767607fe59.zip
Rename close icon to close button (#29387)
-rw-r--r--site/content/docs/4.3/components/alerts.md6
-rw-r--r--site/content/docs/4.3/components/close-button.md (renamed from site/content/docs/4.3/components/close-icon.md)4
-rw-r--r--site/data/sidebar.yml2
3 files changed, 6 insertions, 6 deletions
diff --git a/site/content/docs/4.3/components/alerts.md b/site/content/docs/4.3/components/alerts.md
index 9a283c754..84a4696d4 100644
--- a/site/content/docs/4.3/components/alerts.md
+++ b/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:
diff --git a/site/content/docs/4.3/components/close-icon.md b/site/content/docs/4.3/components/close-button.md
index a4bbdf052..377c365b6 100644
--- a/site/content/docs/4.3/components/close-icon.md
+++ b/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
---
diff --git a/site/data/sidebar.yml b/site/data/sidebar.yml
index a09fdbd50..220fa0d21 100644
--- a/site/data/sidebar.yml
+++ b/site/data/sidebar.yml
@@ -46,7 +46,7 @@
- title: Button group
- title: Card
- title: Carousel
- - title: Close icon
+ - title: Close button
- title: Collapse
- title: Dropdowns
- title: Icons