diff --git a/docs/components.html b/docs/components.html index b169164ad8..2198145ecd 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1454,11 +1454,12 @@ ================================================== -->
+

Provide contextual feedback messages for typical user actions with the handful of available and flexible alert messages. For inline dismissal, use the alerts jQuery plugin.

-

Default alert

-

Wrap any text and an optional dismiss button in .alert for a basic warning alert message.

+

Default alert

+

Wrap any text and an optional dismiss button in .alert for a basic warning alert message. To ensure proper behavior across all devices, be sure to use <button> element with the data-dismiss="alert" data attribute.

@@ -1472,17 +1473,7 @@ </div> -

Dismiss buttons

-

Mobile Safari and Mobile Opera browsers, in addition to the data-dismiss="alert" attribute, require an href="#" for the dismissal of alerts when using an <a> tag.

-
<a href="#" class="close" data-dismiss="alert">&times;</a>
-

Alternatively, you may use a <button> element with the data attribute, which we have opted to do for our docs. When using <button>, you must include type="button" or your forms may not submit.

-
<button type="button" class="close" data-dismiss="alert">&times;</button>
- -

Dismiss alerts via JavaScript

-

Use the alerts jQuery plugin for quick and easy dismissal of alerts.

- - -

Options

+

Block alerts

For longer messages, increase the padding on the top and bottom of the alert wrapper by adding .alert-block.

@@ -1499,10 +1490,8 @@ </div> - -

Contextual alternatives

+

Contextual alternatives

Add optional classes to change an alert's connotation.

-
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 9c4842385d..18b1c4812a 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -1386,11 +1386,12 @@ ================================================== -->
+

Provide contextual feedback messages for typical user actions with the handful of available and flexible alert messages. For inline dismissal, use the alerts jQuery plugin.

-

Default alert

-

Wrap any text and an optional dismiss button in .alert for a basic warning alert message.

+

Default alert

+

Wrap any text and an optional dismiss button in .alert for a basic warning alert message. To ensure proper behavior across all devices, be sure to use <button> element with the data-dismiss="alert" data attribute.

@@ -1404,17 +1405,7 @@ </div> -

Dismiss buttons

-

Mobile Safari and Mobile Opera browsers, in addition to the data-dismiss="alert" attribute, require an href="#" for the dismissal of alerts when using an <a> tag.

-
<a href="#" class="close" data-dismiss="alert">&times;</a>
-

Alternatively, you may use a <button> element with the data attribute, which we have opted to do for our docs. When using <button>, you must include type="button" or your forms may not submit.

-
<button type="button" class="close" data-dismiss="alert">&times;</button>
- -

Dismiss alerts via JavaScript

-

Use the alerts jQuery plugin for quick and easy dismissal of alerts.

- - -

Options

+

Block alerts

For longer messages, increase the padding on the top and bottom of the alert wrapper by adding .alert-block.

@@ -1431,10 +1422,8 @@ </div> - -

Contextual alternatives

+

Contextual alternatives

Add optional classes to change an alert's connotation.

-