Merge branch 'master' of github.com:twbs/bootstrap

docs/_includes/components/badges.html

@@ -21,13 +21,13 @@
   <h4>Adapts to active nav states</h4>
   <p>Built-in styles are included for placing badges in active states in pill navigations.</p>
   <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><a href="#">Profile</a></li>
       <li><a href="#">Messages <span class="badge">3</span></a></li>
     </ul>
     <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">
         <a href="#">
           <span class="badge pull-right">42</span>
@@ -48,7 +48,7 @@
     </button>
   </div>
 {% highlight html %}
-<ul class="nav nav-pills nav-stacked">
+<ul class="nav nav-pills nav-stacked" role="tablist">
   <li class="active">
     <a href="#">
       <span class="badge pull-right">42</span>

docs/_includes/components/navs.html

@@ -27,14 +27,14 @@
   <h2 id="nav-pills">Pills</h2>
   <p>Take that same HTML, but use <code>.nav-pills</code> instead:</p>
   <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><a href="#">Profile</a></li>
       <li><a href="#">Messages</a></li>
     </ul>
   </div>
 {% highlight html %}
-<ul class="nav nav-pills">
+<ul class="nav nav-pills" role="tablist">
   <li class="active"><a href="#">Home</a></li>
   <li><a href="#">Profile</a></li>
   <li><a href="#">Messages</a></li>
@@ -42,14 +42,14 @@
 {% endhighlight %}
   <p>Pills are also vertically stackable. Just add <code>.nav-stacked</code>.</p>
   <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><a href="#">Profile</a></li>
       <li><a href="#">Messages</a></li>
     </ul>
   </div>
 {% highlight html %}
-<ul class="nav nav-pills nav-stacked">
+<ul class="nav nav-pills nav-stacked" role="tablist">
   ...
 </ul>
 {% endhighlight %}
@@ -68,7 +68,7 @@
       <li><a href="#">Messages</a></li>
     </ul>
     <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><a href="#">Profile</a></li>
       <li><a href="#">Messages</a></li>
@@ -78,7 +78,7 @@
 <ul class="nav nav-tabs nav-justified" role="tablist">
   ...
 </ul>
-<ul class="nav nav-pills nav-justified">
+<ul class="nav nav-pills nav-justified" role="tablist">
   ...
 </ul>
 {% endhighlight %}
@@ -93,14 +93,14 @@
   </div>
 
   <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 class="disabled"><a href="#">Disabled link</a></li>
     </ul>
   </div>
 {% highlight html %}
-<ul class="nav nav-pills">
+<ul class="nav nav-pills" role="tablist">
   ...
   <li class="disabled"><a href="#">Disabled link</a></li>
   ...
@@ -147,7 +147,7 @@
 
   <h3>Pills with dropdowns</h3>
   <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><a href="#">Help</a></li>
       <li class="dropdown">
@@ -165,7 +165,7 @@
     </ul>
   </div><!-- /example -->
 {% highlight html %}
-<ul class="nav nav-pills">
+<ul class="nav nav-pills" role="tablist">
   ...
   <li class="dropdown">
     <a class="dropdown-toggle" data-toggle="dropdown" href="#">

docs/_includes/js/dropdowns.html

@@ -59,7 +59,7 @@
 
   <h3>Within pills</h3>
   <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="dropdown">
         <a id="drop4" role="button" data-toggle="dropdown" href="#">Dropdown <span class="caret"></span></a>

docs/examples/jumbotron-narrow/index.html

@@ -34,7 +34,7 @@
 
     <div class="container">
       <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><a href="#">About</a></li>
           <li><a href="#">Contact</a></li>

docs/examples/theme/index.html

@@ -338,7 +338,7 @@
       <p>
         <a href="#">Inbox <span class="badge">42</span></a>
       </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><a href="#">Profile</a></li>
         <li><a href="#">Messages <span class="badge">3</span></a></li>
@@ -369,7 +369,7 @@
         <li><a href="#">Profile</a></li>
         <li><a href="#">Messages</a></li>
       </ul>
-      <ul class="nav nav-pills">
+      <ul class="nav nav-pills" role="tablist">
         <li class="active"><a href="#">Home</a></li>
         <li><a href="#">Profile</a></li>
         <li><a href="#">Messages</a></li>