Commit c7c2a078 authored by Chris Rebert's avatar Chris Rebert
Browse files

Merge pull request #14070 from twbs/pills-role-tablist-too

Add role="tablist" to .nav-pills in examples to improve accessibility
parents 4f5efb84 7c50b9ad
4 merge requests!28721Hot test,!16605Test pull please ignore,!22103test,!25326Adjust examples
Showing with 17 additions and 17 deletions
+17 -17
...@@ -21,13 +21,13 @@ ...@@ -21,13 +21,13 @@
<h4>Adapts to active nav states</h4> <h4>Adapts to active nav states</h4>
<p>Built-in styles are included for placing badges in active states in pill navigations.</p> <p>Built-in styles are included for placing badges in active states in pill navigations.</p>
<div class="bs-example"> <div class="bs-example">
<ul class="nav nav-pills"> <ul class="nav nav-pills" role="tablist">
<li class="active"><a href="#">Home <span class="badge">42</span></a></li> <li class="active"><a href="#">Home <span class="badge">42</span></a></li>
<li><a href="#">Profile</a></li> <li><a href="#">Profile</a></li>
<li><a href="#">Messages <span class="badge">3</span></a></li> <li><a href="#">Messages <span class="badge">3</span></a></li>
</ul> </ul>
<br> <br>
<ul class="nav nav-pills nav-stacked" style="max-width: 260px;"> <ul class="nav nav-pills nav-stacked" role="tablist" style="max-width: 260px;">
<li class="active"> <li class="active">
<a href="#"> <a href="#">
<span class="badge pull-right">42</span> <span class="badge pull-right">42</span>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</button> </button>
</div> </div>
{% highlight html %} {% highlight html %}
<ul class="nav nav-pills nav-stacked"> <ul class="nav nav-pills nav-stacked" role="tablist">
<li class="active"> <li class="active">
<a href="#"> <a href="#">
<span class="badge pull-right">42</span> <span class="badge pull-right">42</span>
......
...@@ -27,14 +27,14 @@ ...@@ -27,14 +27,14 @@
<h2 id="nav-pills">Pills</h2> <h2 id="nav-pills">Pills</h2>
<p>Take that same HTML, but use <code>.nav-pills</code> instead:</p> <p>Take that same HTML, but use <code>.nav-pills</code> instead:</p>
<div class="bs-example"> <div class="bs-example">
<ul class="nav nav-pills"> <ul class="nav nav-pills" role="tablist">
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
<li><a href="#">Profile</a></li> <li><a href="#">Profile</a></li>
<li><a href="#">Messages</a></li> <li><a href="#">Messages</a></li>
</ul> </ul>
</div> </div>
{% highlight html %} {% highlight html %}
<ul class="nav nav-pills"> <ul class="nav nav-pills" role="tablist">
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
<li><a href="#">Profile</a></li> <li><a href="#">Profile</a></li>
<li><a href="#">Messages</a></li> <li><a href="#">Messages</a></li>
...@@ -42,14 +42,14 @@ ...@@ -42,14 +42,14 @@
{% endhighlight %} {% endhighlight %}
<p>Pills are also vertically stackable. Just add <code>.nav-stacked</code>.</p> <p>Pills are also vertically stackable. Just add <code>.nav-stacked</code>.</p>
<div class="bs-example"> <div class="bs-example">
<ul class="nav nav-pills nav-stacked" style="max-width: 300px;"> <ul class="nav nav-pills nav-stacked" role="tablist" style="max-width: 300px;">
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
<li><a href="#">Profile</a></li> <li><a href="#">Profile</a></li>
<li><a href="#">Messages</a></li> <li><a href="#">Messages</a></li>
</ul> </ul>
</div> </div>
{% highlight html %} {% highlight html %}
<ul class="nav nav-pills nav-stacked"> <ul class="nav nav-pills nav-stacked" role="tablist">
... ...
</ul> </ul>
{% endhighlight %} {% endhighlight %}
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<li><a href="#">Messages</a></li> <li><a href="#">Messages</a></li>
</ul> </ul>
<br> <br>
<ul class="nav nav-pills nav-justified"> <ul class="nav nav-pills nav-justified" role="tablist">
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
<li><a href="#">Profile</a></li> <li><a href="#">Profile</a></li>
<li><a href="#">Messages</a></li> <li><a href="#">Messages</a></li>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<ul class="nav nav-tabs nav-justified" role="tablist"> <ul class="nav nav-tabs nav-justified" role="tablist">
... ...
</ul> </ul>
<ul class="nav nav-pills nav-justified"> <ul class="nav nav-pills nav-justified" role="tablist">
... ...
</ul> </ul>
{% endhighlight %} {% endhighlight %}
...@@ -93,14 +93,14 @@ ...@@ -93,14 +93,14 @@
</div> </div>
<div class="bs-example"> <div class="bs-example">
<ul class="nav nav-pills"> <ul class="nav nav-pills" role="tablist">
<li><a href="#">Clickable link</a></li> <li><a href="#">Clickable link</a></li>
<li><a href="#">Clickable link</a></li> <li><a href="#">Clickable link</a></li>
<li class="disabled"><a href="#">Disabled link</a></li> <li class="disabled"><a href="#">Disabled link</a></li>
</ul> </ul>
</div> </div>
{% highlight html %} {% highlight html %}
<ul class="nav nav-pills"> <ul class="nav nav-pills" role="tablist">
... ...
<li class="disabled"><a href="#">Disabled link</a></li> <li class="disabled"><a href="#">Disabled link</a></li>
... ...
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
<h3>Pills with dropdowns</h3> <h3>Pills with dropdowns</h3>
<div class="bs-example"> <div class="bs-example">
<ul class="nav nav-pills"> <ul class="nav nav-pills" role="tablist">
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
<li><a href="#">Help</a></li> <li><a href="#">Help</a></li>
<li class="dropdown"> <li class="dropdown">
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
</ul> </ul>
</div><!-- /example --> </div><!-- /example -->
{% highlight html %} {% highlight html %}
<ul class="nav nav-pills"> <ul class="nav nav-pills" role="tablist">
... ...
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> <a class="dropdown-toggle" data-toggle="dropdown" href="#">
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<h3>Within pills</h3> <h3>Within pills</h3>
<div class="bs-example"> <div class="bs-example">
<ul class="nav nav-pills"> <ul class="nav nav-pills" role="tablist">
<li class="active"><a href="#">Regular link</a></li> <li class="active"><a href="#">Regular link</a></li>
<li class="dropdown"> <li class="dropdown">
<a id="drop4" role="button" data-toggle="dropdown" href="#">Dropdown <span class="caret"></span></a> <a id="drop4" role="button" data-toggle="dropdown" href="#">Dropdown <span class="caret"></span></a>
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<div class="container"> <div class="container">
<div class="header"> <div class="header">
<ul class="nav nav-pills pull-right"> <ul class="nav nav-pills pull-right" role="tablist">
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
<li><a href="#">About</a></li> <li><a href="#">About</a></li>
<li><a href="#">Contact</a></li> <li><a href="#">Contact</a></li>
......
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
<p> <p>
<a href="#">Inbox <span class="badge">42</span></a> <a href="#">Inbox <span class="badge">42</span></a>
</p> </p>
<ul class="nav nav-pills"> <ul class="nav nav-pills" role="tablist">
<li class="active"><a href="#">Home <span class="badge">42</span></a></li> <li class="active"><a href="#">Home <span class="badge">42</span></a></li>
<li><a href="#">Profile</a></li> <li><a href="#">Profile</a></li>
<li><a href="#">Messages <span class="badge">3</span></a></li> <li><a href="#">Messages <span class="badge">3</span></a></li>
...@@ -369,7 +369,7 @@ ...@@ -369,7 +369,7 @@
<li><a href="#">Profile</a></li> <li><a href="#">Profile</a></li>
<li><a href="#">Messages</a></li> <li><a href="#">Messages</a></li>
</ul> </ul>
<ul class="nav nav-pills"> <ul class="nav nav-pills" role="tablist">
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
<li><a href="#">Profile</a></li> <li><a href="#">Profile</a></li>
<li><a href="#">Messages</a></li> <li><a href="#">Messages</a></li>
......
Supports Markdown
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