diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index e083fe6187..da9137a7b3 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3bfd6960ef..a9fdbcffbe 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1975,6 +1975,13 @@ table .span24 { filter: alpha(opacity=40); cursor: pointer; } +button.close { + padding: 0; + cursor: pointer; + background-color: transparent; + border: 0; + -webkit-appearance: none; +} .btn { display: inline-block; *display: inline; diff --git a/docs/components.html b/docs/components.html index d5a3e2a99d..bb9842be2d 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1684,19 +1684,19 @@

Example alerts

Wrap your message and an optional close icon in a div with simple class.

- × + Warning! Best check yo self, you're not looking too good.
 <div class="alert">
-  <a class="close" data-dismiss="alert" href="#">×</a>
+  <button class="close" data-dismiss="alert">×</button>
   <strong>Warning!</strong> Best check yo self, you're not looking too good.
 </div>
 

Heads up! iOS devices require an href="#" for the dismissal of alerts. Be sure to include it and the data attribute for fully responsive and dismissable alerts.

Easily extend the standard alert message with two optional classes: .alert-block for more padding and text controls and .alert-heading for a matching heading.

- × +

Warning!

Best check yo self, you're not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

@@ -1715,7 +1715,7 @@

Error or danger

- × + Oh snap! Change a few things up and try submitting again.
@@ -1727,7 +1727,7 @@
     

Success

- × + Well done! You successfully read this important alert message.
@@ -1739,7 +1739,7 @@
     

Information

- × + Heads up! This alert needs your attention, but it's not super important.
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index d99a1ad441..4188ebcd71 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1607,19 +1607,19 @@
       

{{_i}}Example alerts{{/i}}

{{_i}}Wrap your message and an optional close icon in a div with simple class.{{/i}}

- × + {{_i}}Warning!{{/i}} {{_i}}Best check yo self, you're not looking too good.{{/i}}
 <div class="alert">
-  <a class="close" data-dismiss="alert" href="#">×</a>
+  <button class="close" data-dismiss="alert">×</button>
   <strong>{{_i}}Warning!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
 </div>
 

{{_i}}Heads up!{{/i}} {{_i}}iOS devices require an href="#" for the dismissal of alerts. Be sure to include it and the data attribute for fully responsive and dismissable alerts.{{/i}}

{{_i}}Easily extend the standard alert message with two optional classes: .alert-block for more padding and text controls and .alert-heading for a matching heading.{{/i}}

- × +

{{_i}}Warning!{{/i}}

{{_i}}Best check yo self, you're not looking too good.{{/i}} Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

@@ -1638,7 +1638,7 @@

{{_i}}Error or danger{{/i}}

- × + {{_i}}Oh snap!{{/i}} {{_i}}Change a few things up and try submitting again.{{/i}}
@@ -1650,7 +1650,7 @@
     

{{_i}}Success{{/i}}

- × + {{_i}}Well done!{{/i}} {{_i}}You successfully read this important alert message.{{/i}}
@@ -1662,7 +1662,7 @@
     

{{_i}}Information{{/i}}

- × + {{_i}}Heads up!{{/i}} {{_i}}This alert needs your attention, but it's not super important.{{/i}}
diff --git a/less/close.less b/less/close.less
index a0e5edba1b..b3dd894f2e 100644
--- a/less/close.less
+++ b/less/close.less
@@ -16,3 +16,14 @@
     cursor: pointer;
   }
 }
+
+// Additional properties for button version
+// iOS requires the button element instead of an anchor tag.
+// If you want the anchor version, it requires `href="#"`.
+button.close {
+  padding: 0;
+  cursor: pointer;
+  background-color: transparent;
+  border: 0;
+  -webkit-appearance: none;
+}
\ No newline at end of file