Skip to content

B
bootstrap
Commit d09db290 authored by Mark Otto's avatar Mark Otto
Browse files
Options

#3465 part 1: add type="button" to all dismiss buttons in docs

parent 6f61c96f
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
docs/components.html
View file @ d09db290
...@@ -1688,7 +1688,7 @@ ...@@ -1688,7 +1688,7 @@
<h3>Example alerts</h3> <h3>Example alerts</h3>
<p>Wrap your message and an optional close icon in a div with simple class.</p> <p>Wrap your message and an optional close icon in a div with simple class.</p>
<div class="alert"> <div class="alert">
<button class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>Warning!</strong> Best check yo self, you're not looking too good. <strong>Warning!</strong> Best check yo self, you're not looking too good.
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
...@@ -1700,7 +1700,7 @@ ...@@ -1700,7 +1700,7 @@
<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>button</code> element with the data attribute, which we have opted to do for our docs.</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> <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"> <div class="alert alert-block">
<button class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
<h4 class="alert-heading">Warning!</h4> <h4 class="alert-heading">Warning!</h4>
<p>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.</p> <p>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.</p>
</div> </div>
...@@ -1719,7 +1719,7 @@ ...@@ -1719,7 +1719,7 @@
<div class="span4"> <div class="span4">
<h3>Error or danger</h3> <h3>Error or danger</h3>
<div class="alert alert-error"> <div class="alert alert-error">
<button class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>Oh snap!</strong> Change a few things up and try submitting again. <strong>Oh snap!</strong> Change a few things up and try submitting again.
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
...@@ -1731,7 +1731,7 @@ ...@@ -1731,7 +1731,7 @@
<div class="span4"> <div class="span4">
<h3>Success</h3> <h3>Success</h3>
<div class="alert alert-success"> <div class="alert alert-success">
<button class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>Well done!</strong> You successfully read this important alert message. <strong>Well done!</strong> You successfully read this important alert message.
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
...@@ -1743,7 +1743,7 @@ ...@@ -1743,7 +1743,7 @@
<div class="span4"> <div class="span4">
<h3>Information</h3> <h3>Information</h3>
<div class="alert alert-info"> <div class="alert alert-info">
<button class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>Heads up!</strong> This alert needs your attention, but it's not super important. <strong>Heads up!</strong> This alert needs your attention, but it's not super important.
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
......
docs/javascript.html
View file @ d09db290
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
<div class="well modal-example" style="background-color: #888; border: none;"> <div class="well modal-example" style="background-color: #888; border: none;">
<div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1; max-width: 100%;"> <div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1; max-width: 100%;">
<div class="modal-header"> <div class="modal-header">
<button class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
<h3>Modal header</h3> <h3>Modal header</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
<!-- sample modal content --> <!-- sample modal content -->
<div id="myModal" class="modal hide fade"> <div id="myModal" class="modal hide fade">
<div class="modal-header"> <div class="modal-header">
<button class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
<h3>Modal Heading</h3> <h3>Modal Heading</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
...@@ -954,11 +954,11 @@ $('a[data-toggle="tab"]').on('shown', function (e) { ...@@ -954,11 +954,11 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<h2>Example alerts</h2> <h2>Example alerts</h2>
<p>The alerts plugin works on regular alert messages, and block messages.</p> <p>The alerts plugin works on regular alert messages, and block messages.</p>
<div class="alert fade in"> <div class="alert fade in">
<button class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>Holy guacamole!</strong> Best check yo self, you're not looking too good. <strong>Holy guacamole!</strong> Best check yo self, you're not looking too good.
</div> </div>
<div class="alert alert-block alert-error fade in"> <div class="alert alert-block alert-error fade in">
<button class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
<h4 class="alert-heading">Oh snap! You got an error!</h4> <h4 class="alert-heading">Oh snap! You got an error!</h4>
<p>Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.</p> <p>Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.</p>
<p> <p>
......
docs/templates/pages/components.mustache
View file @ d09db290
...@@ -1611,7 +1611,7 @@ ...@@ -1611,7 +1611,7 @@
<h3>{{_i}}Example alerts{{/i}}</h3> <h3>{{_i}}Example alerts{{/i}}</h3>
<p>{{_i}}Wrap your message and an optional close icon in a div with simple class.{{/i}}</p> <p>{{_i}}Wrap your message and an optional close icon in a div with simple class.{{/i}}</p>
<div class="alert"> <div class="alert">
<button class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>{{_i}}Warning!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}} <strong>{{_i}}Warning!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
...@@ -1623,7 +1623,7 @@ ...@@ -1623,7 +1623,7 @@
<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>button</code> element with the data attribute, which we have opted to do for our docs.{{/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> <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"> <div class="alert alert-block">
<button class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
<h4 class="alert-heading">{{_i}}Warning!{{/i}}</h4> <h4 class="alert-heading">{{_i}}Warning!{{/i}}</h4>
<p>{{_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.</p> <p>{{_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.</p>
</div> </div>
...@@ -1642,7 +1642,7 @@ ...@@ -1642,7 +1642,7 @@
<div class="span4"> <div class="span4">
<h3>{{_i}}Error or danger{{/i}}</h3> <h3>{{_i}}Error or danger{{/i}}</h3>
<div class="alert alert-error"> <div class="alert alert-error">
<button class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>{{_i}}Oh snap!{{/i}}</strong> {{_i}}Change a few things up and try submitting again.{{/i}} <strong>{{_i}}Oh snap!{{/i}}</strong> {{_i}}Change a few things up and try submitting again.{{/i}}
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
...@@ -1654,7 +1654,7 @@ ...@@ -1654,7 +1654,7 @@
<div class="span4"> <div class="span4">
<h3>{{_i}}Success{{/i}}</h3> <h3>{{_i}}Success{{/i}}</h3>
<div class="alert alert-success"> <div class="alert alert-success">
<button class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>{{_i}}Well done!{{/i}}</strong> {{_i}}You successfully read this important alert message.{{/i}} <strong>{{_i}}Well done!{{/i}}</strong> {{_i}}You successfully read this important alert message.{{/i}}
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
...@@ -1666,7 +1666,7 @@ ...@@ -1666,7 +1666,7 @@
<div class="span4"> <div class="span4">
<h3>{{_i}}Information{{/i}}</h3> <h3>{{_i}}Information{{/i}}</h3>
<div class="alert alert-info"> <div class="alert alert-info">
<button class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>{{_i}}Heads up!{{/i}}</strong> {{_i}}This alert needs your attention, but it's not super important.{{/i}} <strong>{{_i}}Heads up!{{/i}}</strong> {{_i}}This alert needs your attention, but it's not super important.{{/i}}
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
......
docs/templates/pages/javascript.mustache
View file @ d09db290
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
<div class="well modal-example" style="background-color: #888; border: none;"> <div class="well modal-example" style="background-color: #888; border: none;">
<div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1; max-width: 100%;"> <div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1; max-width: 100%;">
<div class="modal-header"> <div class="modal-header">
<button class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
<h3>{{_i}}Modal header{{/i}}</h3> <h3>{{_i}}Modal header{{/i}}</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<!-- sample modal content --> <!-- sample modal content -->
<div id="myModal" class="modal hide fade"> <div id="myModal" class="modal hide fade">
<div class="modal-header"> <div class="modal-header">
<button class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
<h3>{{_i}}Modal Heading{{/i}}</h3> <h3>{{_i}}Modal Heading{{/i}}</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
...@@ -877,11 +877,11 @@ $('a[data-toggle="tab"]').on('shown', function (e) { ...@@ -877,11 +877,11 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<h2>{{_i}}Example alerts{{/i}}</h2> <h2>{{_i}}Example alerts{{/i}}</h2>
<p>{{_i}}The alerts plugin works on regular alert messages, and block messages.{{/i}}</p> <p>{{_i}}The alerts plugin works on regular alert messages, and block messages.{{/i}}</p>
<div class="alert fade in"> <div class="alert fade in">
<button class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>{{_i}}Holy guacamole!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}} <strong>{{_i}}Holy guacamole!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
</div> </div>
<div class="alert alert-block alert-error fade in"> <div class="alert alert-block alert-error fade in">
<button class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
<h4 class="alert-heading">{{_i}}Oh snap! You got an error!{{/i}}</h4> <h4 class="alert-heading">{{_i}}Oh snap! You got an error!{{/i}}</h4>
<p>{{_i}}Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.{{/i}}</p> <p>{{_i}}Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.{{/i}}</p>
<p> <p>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment