Merge pull request #18149 from davidjb/html-order-navs

Reorder HTML attributes in Navs documentation

docs/components/navs.md

@@ -54,16 +54,16 @@ Takes the basic nav from above and adds the `.nav-tabs` class to generate a tabb
 {% example html %}
 <ul class="nav nav-tabs">
   <li class="nav-item">
-    <a href="#" class="nav-link active">Active</a>
+    <a class="nav-link active" href="#">Active</a>
   </li>
   <li class="nav-item">
-    <a href="#" class="nav-link">Link</a>
+    <a class="nav-link" href="#">Link</a>
   </li>
   <li class="nav-item">
-    <a href="#" class="nav-link">Another link</a>
+    <a class="nav-link" href="#">Another link</a>
   </li>
   <li class="nav-item">
-    <a href="#" class="nav-link disabled">Disabled</a>
+    <a class="nav-link disabled" href="#">Disabled</a>
   </li>
 </ul>
 {% endexample %}
@@ -75,16 +75,16 @@ Take that same HTML, but use `.nav-pills` instead:
 {% example html %}
 <ul class="nav nav-pills">
   <li class="nav-item">
-    <a href="#" class="nav-link active">Active</a>
+    <a class="nav-link active" href="#">Active</a>
   </li>
   <li class="nav-item">
-    <a href="#" class="nav-link">Link</a>
+    <a class="nav-link" href="#">Link</a>
   </li>
   <li class="nav-item">
-    <a href="#" class="nav-link">Another link</a>
+    <a class="nav-link" href="#">Another link</a>
   </li>
   <li class="nav-item">
-    <a href="#" class="nav-link disabled">Disabled</a>
+    <a class="nav-link disabled" href="#">Disabled</a>
   </li>
 </ul>
 {% endexample %}
@@ -96,16 +96,16 @@ Just add `.nav-stacked` to the `.nav.nav-pills`.
 {% example html %}
 <ul class="nav nav-pills nav-stacked">
   <li class="nav-item">
-    <a href="#" class="nav-link active">Active</a>
+    <a class="nav-link active" href="#">Active</a>
   </li>
   <li class="nav-item">
-    <a href="#" class="nav-link">Link</a>
+    <a class="nav-link" href="#">Link</a>
   </li>
   <li class="nav-item">
-    <a href="#" class="nav-link">Another link</a>
+    <a class="nav-link" href="#">Another link</a>
   </li>
   <li class="nav-item">
-    <a href="#" class="nav-link disabled">Disabled</a>
+    <a class="nav-link disabled" href="#">Disabled</a>
   </li>
 </ul>
 {% endexample %}
@@ -119,7 +119,7 @@ Add dropdown menus with a little extra HTML and the [dropdowns JavaScript plugin
 {% example html %}
 <ul class="nav nav-tabs">
   <li class="nav-item">
-    <a href="#" class="nav-link active">Active</a>
+    <a class="nav-link active" href="#">Active</a>
   </li>
   <li class="nav-item dropdown">
     <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">Dropdown</a>
@@ -132,10 +132,10 @@ Add dropdown menus with a little extra HTML and the [dropdowns JavaScript plugin
     </div>
   </li>
   <li class="nav-item">
-    <a href="#" class="nav-link">Another link</a>
+    <a class="nav-link" href="#">Another link</a>
   </li>
   <li class="nav-item">
-    <a href="#" class="nav-link disabled">Disabled</a>
+    <a class="nav-link disabled" href="#">Disabled</a>
   </li>
 </ul>
 {% endexample %}
@@ -145,7 +145,7 @@ Add dropdown menus with a little extra HTML and the [dropdowns JavaScript plugin
 {% example html %}
 <ul class="nav nav-pills">
   <li class="nav-item">
-    <a href="#" class="nav-link active">Active</a>
+    <a class="nav-link active" href="#">Active</a>
   </li>
   <li class="nav-item dropdown">
     <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">Dropdown</a>
@@ -158,10 +158,10 @@ Add dropdown menus with a little extra HTML and the [dropdowns JavaScript plugin
     </div>
   </li>
   <li class="nav-item">
-    <a href="#" class="nav-link">Another link</a>
+    <a class="nav-link" href="#">Another link</a>
   </li>
   <li class="nav-item">
-    <a href="#" class="nav-link disabled">Disabled</a>
+    <a class="nav-link disabled" href="#">Disabled</a>
   </li>
 </ul>
 {% endexample %}
@@ -171,34 +171,34 @@ Add dropdown menus with a little extra HTML and the [dropdowns JavaScript plugin
 Use the tab JavaScript plugin—include it individually or through the compiled `bootstrap.js` file—to extend our navigational tabs and pills to create tabbable panes of local content, even via dropdown menus.
 
 <div class="bd-example bd-example-tabs" role="tabpanel">
-  <ul id="myTab" class="nav nav-tabs" role="tablist">
+  <ul class="nav nav-tabs" id="myTab" role="tablist">
     <li class="nav-item">
-      <a class="nav-link active" href="#home" id="home-tab" role="tab" data-toggle="tab" aria-controls="home" aria-expanded="true">Home</a>
+      <a class="nav-link active" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home" aria-expanded="true">Home</a>
     </li>
     <li class="nav-item">
-      <a class="nav-link" href="#profile" role="tab" id="profile-tab" data-toggle="tab" aria-controls="profile">Profile</a>
+      <a class="nav-link" id="profile-tab" data-toggle="tab" href="#profile" role="tab" aria-controls="profile">Profile</a>
     </li>
     <li class="nav-item dropdown">
       <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
         Dropdown
       </a>
       <div class="dropdown-menu">
-        <a class="dropdown-item" href="#dropdown1" role="tab" id="dropdown1-tab" data-toggle="tab" aria-controls="dropdown1">@fat</a>
-        <a class="dropdown-item" href="#dropdown2" role="tab" id="dropdown2-tab" data-toggle="tab" aria-controls="dropdown2">@mdo</a>
+        <a class="dropdown-item" id="dropdown1-tab" href="#dropdown1" role="tab" data-toggle="tab" aria-controls="dropdown1">@fat</a>
+        <a class="dropdown-item" id="dropdown2-tab" href="#dropdown2" role="tab" data-toggle="tab" aria-controls="dropdown2">@mdo</a>
       </div>
     </li>
   </ul>
-  <div id="myTabContent" class="tab-content">
+  <div class="tab-content" id="myTabContent">
     <div role="tabpanel" class="tab-pane fade in active" id="home" aria-labelledBy="home-tab">
       <p>Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.</p>
     </div>
-    <div role="tabpanel" class="tab-pane fade" id="profile" aria-labelledBy="profile-tab">
+    <div class="tab-pane fade" id="profile" role="tabpanel" aria-labelledBy="profile-tab">
       <p>Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.</p>
     </div>
-    <div role="tabpanel" class="tab-pane fade" id="dropdown1" aria-labelledBy="dropdown1-tab">
+    <div class="tab-pane fade" id="dropdown1" role="tabpanel" aria-labelledBy="dropdown1-tab">
       <p>Etsy mixtape wayfarers, ethical wes anderson tofu before they sold out mcsweeney's organic lomo retro fanny pack lo-fi farm-to-table readymade. Messenger bag gentrify pitchfork tattooed craft beer, iphone skateboard locavore carles etsy salvia banksy hoodie helvetica. DIY synth PBR banksy irony. Leggings gentrify squid 8-bit cred pitchfork. Williamsburg banh mi whatever gluten-free, carles pitchfork biodiesel fixie etsy retro mlkshk vice blog. Scenester cred you probably haven't heard of them, vinyl craft beer blog stumptown. Pitchfork sustainable tofu synth chambray yr.</p>
     </div>
-    <div role="tabpanel" class="tab-pane fade" id="dropdown2" aria-labelledBy="dropdown2-tab">
+    <div class="tab-pane fade" id="dropdown2" role="tabpanel" aria-labelledBy="dropdown2-tab">
       <p>Trust fund seitan letterpress, keytar raw denim keffiyeh etsy art party before they sold out master cleanse gluten-free squid scenester freegan cosby sweater. Fanny pack portland seitan DIY, art party locavore wolf cliche high life echo park Austin. Cred vinyl keffiyeh DIY salvia PBR, banh mi before they sold out farm-to-table VHS viral locavore cosby sweater. Lomo wolf viral, mustache readymade thundercats keffiyeh craft beer marfa ethical. Wolf salvia freegan, sartorial keffiyeh echo park vegan.</p>
     </div>
   </div>
@@ -213,25 +213,25 @@ You can activate a tab or pill navigation without writing any JavaScript by simp
 <!-- Nav tabs -->
 <ul class="nav nav-tabs" role="tablist">
   <li class="nav-item">
-    <a class="nav-link active" href="#home" role="tab" data-toggle="tab">Home</a>
+    <a class="nav-link active" data-toggle="tab" href="#home" role="tab">Home</a>
   </li>
   <li class="nav-item">
-    <a class="nav-link" href="#profile" role="tab" data-toggle="tab">Profile</a>
+    <a class="nav-link" data-toggle="tab" href="#profile" role="tab">Profile</a>
   </li>
   <li class="nav-item">
-    <a class="nav-link" href="#messages" role="tab" data-toggle="tab">Messages</a>
+    <a class="nav-link" data-toggle="tab" href="#messages" role="tab">Messages</a>
   </li>
   <li class="nav-item">
-    <a class="nav-link" href="#settings" role="tab" data-toggle="tab">Settings</a>
+    <a class="nav-link" data-toggle="tab" href="#settings" role="tab">Settings</a>
   </li>
 </ul>
 
 <!-- Tab panes -->
 <div class="tab-content">
-  <div role="tabpanel" class="tab-pane active" id="home">...</div>
-  <div role="tabpanel" class="tab-pane" id="profile">...</div>
-  <div role="tabpanel" class="tab-pane" id="messages">...</div>
-  <div role="tabpanel" class="tab-pane" id="settings">...</div>
+  <div class="tab-pane active" id="home" role="tabpanel">...</div>
+  <div class="tab-pane" id="profile" role="tabpanel">...</div>
+  <div class="tab-pane" id="messages" role="tabpanel">...</div>
+  <div class="tab-pane" id="settings" role="tabpanel">...</div>
 </div>
 {% endhighlight %}
 </div>
@@ -262,10 +262,10 @@ To make tabs fade in, add `.fade` to each `.tab-pane`. The first tab pane must a
 
 {% highlight html %}
 <div class="tab-content">
-  <div role="tabpanel" class="tab-pane fade in active" id="home">...</div>
-  <div role="tabpanel" class="tab-pane fade" id="profile">...</div>
-  <div role="tabpanel" class="tab-pane fade" id="messages">...</div>
-  <div role="tabpanel" class="tab-pane fade" id="settings">...</div>
+  <div class="tab-pane fade in active" id="home" role="tabpanel">...</div>
+  <div class="tab-pane fade" id="profile" role="tabpanel">...</div>
+  <div class="tab-pane fade" id="messages" role="tabpanel">...</div>
+  <div class="tab-pane fade" id="settings" role="tabpanel">...</div>
 </div>
 {% endhighlight %}
 
@@ -276,26 +276,26 @@ To make tabs fade in, add `.fade` to each `.tab-pane`. The first tab pane must a
 Activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the DOM.
 
 {% highlight html %}
-<ul class="nav nav-tabs" role="tablist" id="myTab">
+<ul class="nav nav-tabs" id="myTab" role="tablist">
   <li class="nav-item">
-    <a class="nav-link active" href="#home" role="tab" data-toggle="tab" aria-controls="home">Home</a>
+    <a class="nav-link active" data-toggle="tab" href="#home" role="tab" aria-controls="home">Home</a>
   </li>
   <li class="nav-item">
-    <a class="nav-link" href="#profile" role="tab" data-toggle="tab" aria-controls="profile">Profile</a>
+    <a class="nav-link" data-toggle="tab" href="#profile" role="tab" aria-controls="profile">Profile</a>
   </li>
   <li class="nav-item">
-    <a class="nav-link" href="#messages" role="tab" data-toggle="tab" aria-controls="messages">Messages</a>
+    <a class="nav-link" data-toggle="tab" href="#messages" role="tab" aria-controls="messages">Messages</a>
   </li>
   <li class="nav-item">
-    <a class="nav-link" href="#settings" role="tab" data-toggle="tab" aria-controls="settings">Settings</a>
+    <a class="nav-link" data-toggle="tab" href="#settings" role="tab" aria-controls="settings">Settings</a>
   </li>
 </ul>
 
 <div class="tab-content">
-  <div role="tabpanel" class="tab-pane active" id="home">...</div>
-  <div role="tabpanel" class="tab-pane" id="profile">...</div>
-  <div role="tabpanel" class="tab-pane" id="messages">...</div>
-  <div role="tabpanel" class="tab-pane" id="settings">...</div>
+  <div class="tab-pane active" id="home" role="tabpanel">...</div>
+  <div class="tab-pane" id="profile" role="tabpanel">...</div>
+  <div class="tab-pane" id="messages" role="tabpanel">...</div>
+  <div class="tab-pane" id="settings" role="tabpanel">...</div>
 </div>
 
 <script>