aboutsummaryrefslogtreecommitdiff
path: root/components.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-12 10:01:22 -0700
committerMark Otto <[email protected]>2013-08-12 10:01:22 -0700
commita9a27d37944bbc1edb1248d22e596707af85502a (patch)
tree493fa0e64181ca580ab51fa73394463710c430df /components.html
parent55cfa8d38f71623aaa5e2aae97b483af60650910 (diff)
parent1f745176d4e667fd75a492509a4e08ca54af07ae (diff)
downloadbootstrap-a9a27d37944bbc1edb1248d22e596707af85502a.tar.xz
bootstrap-a9a27d37944bbc1edb1248d22e596707af85502a.zip
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to 'components.html')
-rw-r--r--components.html16
1 files changed, 8 insertions, 8 deletions
diff --git a/components.html b/components.html
index 4c52d59f3..7031647d6 100644
--- a/components.html
+++ b/components.html
@@ -1285,8 +1285,8 @@ body { padding-bottom: 70px; }
</ul>
</li>
</ul>
- <form class="navbar-form pull-left" action="" role="form">
- <input type="text" class="form-control col-lg-8" placeholder="Search" role="search">
+ <form class="navbar-form pull-left" action="" role="search">
+ <input type="text" class="form-control col-lg-8" placeholder="Search">
</form>
<ul class="nav navbar-nav pull-right">
<li><a href="#">Link</a></li>
@@ -1355,8 +1355,8 @@ body { padding-bottom: 70px; }
<li><a href="#">Link</a></li>
<li><a href="#">Link</a></li>
</ul>
- <form class="navbar-form pull-left" action="" role="form">
- <input type="text" class="form-control col-lg-8" placeholder="Search" role="search">
+ <form class="navbar-form pull-left" action="" role="search">
+ <input type="text" class="form-control col-lg-8" placeholder="Search">
</form>
</div><!-- /.nav-collapse -->
</div><!-- /.container -->
@@ -1405,8 +1405,8 @@ body { padding-bottom: 70px; }
</ul>
</li>
</ul>
- <form class="navbar-form pull-left" action="" role="form">
- <input type="text" class="form-control col-lg-8" placeholder="Search" role="search">
+ <form class="navbar-form pull-left" action="" role="search">
+ <input type="text" class="form-control col-lg-8" placeholder="Search">
</form>
<ul class="nav navbar-nav pull-right">
<li><a href="#">Link</a></li>
@@ -1917,13 +1917,13 @@ body { padding-bottom: 70px; }
<p>Build on any alert by adding an optional <code>.alert-dismissable</code> and close button.</p>
<div class="bs-example">
<div class="alert alert-dismissable">
- <button type="button" class="close" data-dismiss="alert">&times;</button>
+ <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<strong>Warning!</strong> Best check yo self, you're not looking too good.
</div>
</div>
{% highlight html %}
<div class="alert alert-dismissable">
- <button type="button" class="close" data-dismiss="alert">&times;</button>
+ <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<strong>Warning!</strong> Best check yo self, you're not looking too good.
</div>
{% endhighlight %}