aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-05-13 14:03:32 -0700
committerMark Otto <[email protected]>2012-05-13 14:03:32 -0700
commit7de65e0a628a3faa1b3837aabea43ae234c5b7a4 (patch)
treeb00b097ed16b0c36edc583bf357c8dca269d5396 /docs
parentd09db29039ba498c8d3255cadafb2c5c88ff1a2f (diff)
downloadbootstrap-7de65e0a628a3faa1b3837aabea43ae234c5b7a4.tar.xz
bootstrap-7de65e0a628a3faa1b3837aabea43ae234c5b7a4.zip
#3465 part 2: add mention to docs of type button issue
Diffstat (limited to 'docs')
-rw-r--r--docs/components.html4
-rw-r--r--docs/templates/pages/components.mustache4
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/components.html b/docs/components.html
index 624af075f..1ff759f2e 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1665,7 +1665,7 @@
-<!-- Alerts & Messages
+<!-- Alerts
================================================== -->
<section id="alerts">
<div class="page-header">
@@ -1697,7 +1697,7 @@
&lt;strong&gt;Warning!&lt;/strong&gt; Best check yo self, you're not looking too good.
&lt;/div&gt;
</pre>
- <p><span class="label label-info">Heads up!</span> iOS devices require an <code>href="#"</code> for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. Alternatively, you may use a <code>button</code> element with the data attribute, which we have opted to do for our docs.</p>
+ <p><span class="label label-info">Heads up!</span> iOS devices require an <code>href="#"</code> for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. Alternatively, you may use a <code>&lt;button&gt;</code> element with the data attribute, which we have opted to do for our docs. When using <code>&lt;button&gt;</code>, you must include <code>type="button"</code> or risk unintentional form submissions.</p>
<p>Easily extend the standard alert message with two optional classes: <code>.alert-block</code> for more padding and text controls and <code>.alert-heading</code> for a matching heading.</p>
<div class="alert alert-block">
<button type="button" class="close" data-dismiss="alert">&times;</button>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 45c244cef..fd6748fe0 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1588,7 +1588,7 @@
-<!-- Alerts & Messages
+<!-- Alerts
================================================== -->
<section id="alerts">
<div class="page-header">
@@ -1620,7 +1620,7 @@
&lt;strong&gt;{{_i}}Warning!{{/i}}&lt;/strong&gt; {{_i}}Best check yo self, you're not looking too good.{{/i}}
&lt;/div&gt;
</pre>
- <p><span class="label label-info">{{_i}}Heads up!{{/i}}</span> {{_i}}iOS devices require an <code>href="#"</code> for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. Alternatively, you may use a <code>button</code> element with the data attribute, which we have opted to do for our docs.{{/i}}</p>
+ <p><span class="label label-info">{{_i}}Heads up!{{/i}}</span> {{_i}}iOS devices require an <code>href="#"</code> for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. Alternatively, you may use a <code>&lt;button&gt;</code> element with the data attribute, which we have opted to do for our docs. When using <code>&lt;button&gt;</code>, you must include <code>type="button"</code> or risk unintentional form submissions.{{/i}}</p>
<p>{{_i}}Easily extend the standard alert message with two optional classes: <code>.alert-block</code> for more padding and text controls and <code>.alert-heading</code> for a matching heading.{{/i}}</p>
<div class="alert alert-block">
<button type="button" class="close" data-dismiss="alert">&times;</button>