]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 31f7cb1)
consistently use <nav> instead of <div> for .navbar in docs 14406/head
authorChris Rebert <code@rebertia.com>
Sat, 16 Aug 2014 01:09:05 +0000 (18:09 -0700)
committerChris Rebert <code@rebertia.com>
Sat, 16 Aug 2014 01:09:05 +0000 (18:09 -0700)
12 files changed:
docs/examples/carousel/index.html patch | blob | blame | history
docs/examples/dashboard/index.html patch | blob | blame | history
docs/examples/jumbotron/index.html patch | blob | blame | history
docs/examples/navbar-fixed-top/index.html patch | blob | blame | history
docs/examples/navbar-static-top/index.html patch | blob | blame | history
docs/examples/navbar/index.html patch | blob | blame | history
docs/examples/non-responsive/index.html patch | blob | blame | history
docs/examples/offcanvas/index.html patch | blob | blame | history
docs/examples/starter-template/index.html patch | blob | blame | history
docs/examples/sticky-footer-navbar/index.html patch | blob | blame | history
docs/examples/theme/index.html patch | blob | blame | history
js/tests/unit/scrollspy.js patch | blob | blame | history

diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html
index 157ec42ff89105389f7b764b8285fb8420eaa00f..193a92657e28ea69ff91de76c910ef5eaa6712c1 100644 (file)
--- a/docs/examples/carousel/index.html
+++ b/docs/examples/carousel/index.html
@@ -32,7 +32,7 @@
     <div class="navbar-wrapper">
       <div class="container">
 
-        <div class="navbar navbar-inverse navbar-static-top" role="navigation">
+        <nav class="navbar navbar-inverse navbar-static-top" role="navigation">
           <div class="container">
             <div class="navbar-header">
               <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@@ -63,7 +63,7 @@
               </ul>
             </div>
           </div>
-        </div>
+        </nav>
 
       </div>
     </div>
diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html
index 7c5efa6cf4421d80b890c0e56ca95818ab3f5358..6554d329be710b50712df0f15b4bb98d67693f0e 100644 (file)
--- a/docs/examples/dashboard/index.html
+++ b/docs/examples/dashboard/index.html
@@ -29,7 +29,7 @@
 
   <body>
 
-    <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+    <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
       <div class="container-fluid">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@@ -52,7 +52,7 @@
           </form>
         </div>
       </div>
-    </div>
+    </nav>
 
     <div class="container-fluid">
       <div class="row">
diff --git a/docs/examples/jumbotron/index.html b/docs/examples/jumbotron/index.html
index 46e568ad2a8dee1d5925a37f8d374a9fa45f54e2..084dcfba135b284406766dccbbb7598c21a2f27e 100644 (file)
--- a/docs/examples/jumbotron/index.html
+++ b/docs/examples/jumbotron/index.html
@@ -29,7 +29,7 @@
 
   <body>
 
-    <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+    <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
       <div class="container">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@@ -52,7 +52,7 @@
           </form>
         </div><!--/.navbar-collapse -->
       </div>
-    </div>
+    </nav>
 
     <!-- Main jumbotron for a primary marketing message or call to action -->
     <div class="jumbotron">
diff --git a/docs/examples/navbar-fixed-top/index.html b/docs/examples/navbar-fixed-top/index.html
index 85edc6ed47bc2333a7b91117f27c03f37f706d2f..9d6fc3da3bb5d490e757618e3813197529a22f3e 100644 (file)
--- a/docs/examples/navbar-fixed-top/index.html
+++ b/docs/examples/navbar-fixed-top/index.html
@@ -30,7 +30,7 @@
   <body>
 
     <!-- Fixed navbar -->
-    <div class="navbar navbar-default navbar-fixed-top" role="navigation">
+    <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
       <div class="container">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@@ -66,7 +66,7 @@
           </ul>
         </div><!--/.nav-collapse -->
       </div>
-    </div>
+    </nav>
 
     <div class="container">
 
diff --git a/docs/examples/navbar-static-top/index.html b/docs/examples/navbar-static-top/index.html
index 0afe6f042cb229d45c74aaf41fea62a96de95526..7bf0612a4cf30de690916f6815970e567c6c218e 100644 (file)
--- a/docs/examples/navbar-static-top/index.html
+++ b/docs/examples/navbar-static-top/index.html
@@ -30,7 +30,7 @@
   <body>
 
     <!-- Static navbar -->
-    <div class="navbar navbar-default navbar-static-top" role="navigation">
+    <nav class="navbar navbar-default navbar-static-top" role="navigation">
       <div class="container">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@@ -66,7 +66,7 @@
           </ul>
         </div><!--/.nav-collapse -->
       </div>
-    </div>
+    </nav>
 
 
     <div class="container">
diff --git a/docs/examples/navbar/index.html b/docs/examples/navbar/index.html
index 44c553c7baeeaed2c16242ed78cfbc7bfd34cc8d..18602664d45ab4012da9f62adb4bdd4fe678ac38 100644 (file)
--- a/docs/examples/navbar/index.html
+++ b/docs/examples/navbar/index.html
@@ -32,7 +32,7 @@
     <div class="container">
 
       <!-- Static navbar -->
-      <div class="navbar navbar-default" role="navigation">
+      <nav class="navbar navbar-default" role="navigation">
         <div class="container-fluid">
           <div class="navbar-header">
             <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@@ -68,7 +68,7 @@
             </ul>
           </div><!--/.nav-collapse -->
         </div><!--/.container-fluid -->
-      </div>
+      </nav>
 
       <!-- Main component for a primary marketing message or call to action -->
       <div class="jumbotron">
diff --git a/docs/examples/non-responsive/index.html b/docs/examples/non-responsive/index.html
index d17cdd849b9cb9520dbd1a38e2630c9516ca01fa..9438a4079fc13ced4757e8dc46659c4c13f828c4 100644 (file)
--- a/docs/examples/non-responsive/index.html
+++ b/docs/examples/non-responsive/index.html
@@ -32,7 +32,7 @@
   <body>
 
     <!-- Fixed navbar -->
-    <div class="navbar navbar-default navbar-fixed-top" role="navigation">
+    <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
       <div class="container">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@@ -68,7 +68,7 @@
           </ul>
         </div><!--/.nav-collapse -->
       </div>
-    </div>
+    </nav>
 
     <div class="container">
 
diff --git a/docs/examples/offcanvas/index.html b/docs/examples/offcanvas/index.html
index 64b56c52f6bd20d669121e383a0be60d01a125a3..a8e865d5e3aa88efa143fed094c6e2d3ce5e9862 100644 (file)
--- a/docs/examples/offcanvas/index.html
+++ b/docs/examples/offcanvas/index.html
@@ -28,7 +28,7 @@
   </head>
 
   <body>
-    <div class="navbar navbar-fixed-top navbar-inverse" role="navigation">
+    <nav class="navbar navbar-fixed-top navbar-inverse" role="navigation">
       <div class="container">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@@ -47,7 +47,7 @@
           </ul>
         </div><!-- /.nav-collapse -->
       </div><!-- /.container -->
-    </div><!-- /.navbar -->
+    </nav><!-- /.navbar -->
 
     <div class="container">
 
diff --git a/docs/examples/starter-template/index.html b/docs/examples/starter-template/index.html
index 12d71f5b1172ca378349b3fbbe5bc46d12542082..11b6c8c7b4214fa1622ae04895b337b3add245cd 100644 (file)
--- a/docs/examples/starter-template/index.html
+++ b/docs/examples/starter-template/index.html
@@ -29,7 +29,7 @@
 
   <body>
 
-    <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+    <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
       <div class="container">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@@ -48,7 +48,7 @@
           </ul>
         </div><!--/.nav-collapse -->
       </div>
-    </div>
+    </nav>
 
     <div class="container">
 
diff --git a/docs/examples/sticky-footer-navbar/index.html b/docs/examples/sticky-footer-navbar/index.html
index 102bb4a22ca7a31d9aab21dd2ff707f22a01d6cc..5633ca21f0fc683b27a1acae714e05a0b07d72f0 100644 (file)
--- a/docs/examples/sticky-footer-navbar/index.html
+++ b/docs/examples/sticky-footer-navbar/index.html
@@ -30,7 +30,7 @@
   <body>
 
     <!-- Fixed navbar -->
-    <div class="navbar navbar-default navbar-fixed-top" role="navigation">
+    <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
       <div class="container">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@@ -61,7 +61,7 @@
           </ul>
         </div><!--/.nav-collapse -->
       </div>
-    </div>
+    </nav>
 
     <!-- Begin page content -->
     <div class="container">
diff --git a/docs/examples/theme/index.html b/docs/examples/theme/index.html
index af5620e9d48fc029a457491f622d08e92650376f..8e8c72a1d9143fa00a2b2e3cb6343616c37937d0 100644 (file)
--- a/docs/examples/theme/index.html
+++ b/docs/examples/theme/index.html
@@ -32,7 +32,7 @@
   <body role="document">
 
     <!-- Fixed navbar -->
-    <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+    <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
       <div class="container">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@@ -63,7 +63,7 @@
           </ul>
         </div><!--/.nav-collapse -->
       </div>
-    </div>
+    </nav>
 
     <div class="container theme-showcase" role="main">
 
@@ -378,7 +378,7 @@
         <h1>Navbars</h1>
       </div>
 
-      <div class="navbar navbar-default">
+      <nav class="navbar navbar-default">
         <div class="container">
           <div class="navbar-header">
             <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@@ -409,9 +409,9 @@
             </ul>
           </div><!--/.nav-collapse -->
         </div>
-      </div>
+      </nav>
 
-      <div class="navbar navbar-inverse">
+      <nav class="navbar navbar-inverse">
         <div class="container">
           <div class="navbar-header">
             <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@@ -442,7 +442,7 @@
             </ul>
           </div><!--/.nav-collapse -->
         </div>
-      </div>
+      </nav>
 
 
 
diff --git a/js/tests/unit/scrollspy.js b/js/tests/unit/scrollspy.js
index b18d91189ca7f5c99051b72b61252d92db90e287..c071d0f65366fd22b97d874c0fef4cb22cfe7db6 100644 (file)
--- a/js/tests/unit/scrollspy.js
+++ b/js/tests/unit/scrollspy.js
@@ -124,12 +124,12 @@ $(function () {
 
   test('should add the active class to the correct element', function () {
     var navbarHtml =
-        '<div class="navbar">'
+        '<nav class="navbar">'
       + '<ul class="nav">'
       + '<li id="li-1"><a href="#div-1">div 1</a></li>'
       + '<li id="li-2"><a href="#div-2">div 2</a></li>'
       + '</ul>'
-      + '</div>'
+      + '</nav>'
     var contentHtml =
         '<div class="content" style="overflow: auto; height: 50px">'
       + '<div id="div-1" style="height: 100px; padding: 0; margin: 0">div 1</div>'
Mirror of https://github.com/twbs/bootstrap.git