aboutsummaryrefslogtreecommitdiff
path: root/docs/javascript.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-03-27 09:21:35 -0700
committerMark Otto <[email protected]>2012-03-27 09:21:35 -0700
commit5b3268317c479c9cc50d7a1270b9138e748b8956 (patch)
tree0fd6e3a39f10527091f4b2758d1ea09d50b2d66f /docs/javascript.html
parentd27fc24aa027f4c9bdb9aa3648eebfcd6aed5acf (diff)
parent155a7c10675c907e5407c2b78cc83b41b90b15ff (diff)
downloadbootstrap-5b3268317c479c9cc50d7a1270b9138e748b8956.tar.xz
bootstrap-5b3268317c479c9cc50d7a1270b9138e748b8956.zip
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts: docs/assets/bootstrap.zip
Diffstat (limited to 'docs/javascript.html')
-rw-r--r--docs/javascript.html10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/javascript.html b/docs/javascript.html
index 70646afdb..4f777e031 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -208,7 +208,7 @@
<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">
<div class="modal-header">
- <a href="#" class="close" data-dismiss="modal">&times;</a>
+ <button class="close" data-dismiss="modal">&times;</button>
<h3>Modal header</h3>
</div>
<div class="modal-body">
@@ -226,7 +226,7 @@
<!-- sample modal content -->
<div id="myModal" class="modal hide fade">
<div class="modal-header">
- <a class="close" data-dismiss="modal" >&times;</a>
+ <button class="close" data-dismiss="modal">&times;</button>
<h3>Modal Heading</h3>
</div>
<div class="modal-body">
@@ -303,7 +303,7 @@
<pre class="prettyprint linenums">
&lt;div class="modal" id="myModal"&gt;
&lt;div class="modal-header"&gt;
- &lt;a class="close" data-dismiss="modal"&gt;&times;&lt;/a&gt;
+ &lt;button class="close" data-dismiss="modal"&gt;&times;&lt;/button&gt;
&lt;h3&gt;Modal header&lt;/h3&gt;
&lt;/div&gt;
&lt;div class="modal-body"&gt;
@@ -964,11 +964,11 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<h2>Example alerts</h2>
<p>The alerts plugin works on regular alert messages, and block messages.</p>
<div class="alert fade in">
- <a class="close" data-dismiss="alert" href="#">&times;</a>
+ <button class="close" data-dismiss="alert">&times;</button>
<strong>Holy guacamole!</strong> Best check yo self, you're not looking too good.
</div>
<div class="alert alert-block alert-error fade in">
- <a class="close" data-dismiss="alert" href="#">&times;</a>
+ <button class="close" data-dismiss="alert">&times;</button>
<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>