aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2014-08-20 21:48:59 -0700
committerChris Rebert <[email protected]>2014-08-20 21:48:59 -0700
commit9efedf8f7b87222289c517d6fedde8cb401c1003 (patch)
tree36e3aa942836eece1387680114021e617a569b0c
parentc95aa97c03fc676f7b53d002c7c8a3bb59fd6747 (diff)
parent6b7142212fdc57d247d0327e15f8b19c8b3f9d6d (diff)
downloadbootstrap-9efedf8f7b87222289c517d6fedde8cb401c1003.tar.xz
bootstrap-9efedf8f7b87222289c517d6fedde8cb401c1003.zip
Merge pull request #14406 from twbs/nav-tag-for-navbar
consistently use <nav> instead of <div> for .navbar in docs
Diffstat
-rw-r--r--docs/examples/carousel/index.html4
-rw-r--r--docs/examples/dashboard/index.html4
-rw-r--r--docs/examples/jumbotron/index.html4
-rw-r--r--docs/examples/navbar-fixed-top/index.html4
-rw-r--r--docs/examples/navbar-static-top/index.html4
-rw-r--r--docs/examples/navbar/index.html4
-rw-r--r--docs/examples/non-responsive/index.html4
-rw-r--r--docs/examples/offcanvas/index.html4
-rw-r--r--docs/examples/starter-template/index.html4
-rw-r--r--docs/examples/sticky-footer-navbar/index.html4
-rw-r--r--docs/examples/theme/index.html12
-rw-r--r--js/tests/unit/scrollspy.js4
12 files changed, 28 insertions, 28 deletions
diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html
index 157ec42ff..193a92657 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 7c5efa6cf..6554d329b 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 46e568ad2..084dcfba1 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 85edc6ed4..9d6fc3da3 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 0afe6f042..7bf0612a4 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 44c553c7b..18602664d 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 d17cdd849..9438a4079 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 64b56c52f..a8e865d5e 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 12d71f5b1..11b6c8c7b 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 102bb4a22..5633ca21f 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 af5620e9d..8e8c72a1d 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 b18d91189..c071d0f65 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>'
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-06 13:47:31 +0000