diff options
author | Chris Rebert <code@rebertia.com> | 2014-08-16 05:09:05 +0400 |
---|---|---|
committer | Chris Rebert <code@rebertia.com> | 2014-08-16 05:09:05 +0400 |
commit | 6b7142212fdc57d247d0327e15f8b19c8b3f9d6d (patch) | |
tree | 024530649c3420e653a8eeea22d8d04a03a402cc | |
parent | 31f7cb152efbc22ea61801915d81ba2b13435f97 (diff) |
consistently use <nav> instead of <div> for .navbar in docs
-rw-r--r-- | docs/examples/carousel/index.html | 4 | ||||
-rw-r--r-- | docs/examples/dashboard/index.html | 4 | ||||
-rw-r--r-- | docs/examples/jumbotron/index.html | 4 | ||||
-rw-r--r-- | docs/examples/navbar-fixed-top/index.html | 4 | ||||
-rw-r--r-- | docs/examples/navbar-static-top/index.html | 4 | ||||
-rw-r--r-- | docs/examples/navbar/index.html | 4 | ||||
-rw-r--r-- | docs/examples/non-responsive/index.html | 4 | ||||
-rw-r--r-- | docs/examples/offcanvas/index.html | 4 | ||||
-rw-r--r-- | docs/examples/starter-template/index.html | 4 | ||||
-rw-r--r-- | docs/examples/sticky-footer-navbar/index.html | 4 | ||||
-rw-r--r-- | docs/examples/theme/index.html | 12 | ||||
-rw-r--r-- | js/tests/unit/scrollspy.js | 4 |
12 files changed, 28 insertions, 28 deletions
diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html index 157ec42ff8..193a92657e 100644 --- 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 7c5efa6cf4..6554d329be 100644 --- 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 46e568ad2a..084dcfba13 100644 --- 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 85edc6ed47..9d6fc3da3b 100644 --- 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 0afe6f042c..7bf0612a4c 100644 --- 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 44c553c7ba..18602664d4 100644 --- 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 d17cdd849b..9438a4079f 100644 --- 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 64b56c52f6..a8e865d5e3 100644 --- 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 12d71f5b11..11b6c8c7b4 100644 --- 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 102bb4a22c..5633ca21f0 100644 --- 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 af5620e9d4..8e8c72a1d9 100644 --- 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 b18d91189c..c071d0f653 100644 --- 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>' |