rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-06 04:08:22 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #14406 from twbs/nav-tag-for-navbar

Browse Source 
consistently use <nav> instead of <div> for .navbar in docs
This commit is contained in:
Chris Rebert 2014-08-20 21:48:59 -07:00
commit 9efedf8f7b
12 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/examples/carousel/index.html
View File

@ -32,7 +32,7 @@
<div class="navbar-wrapper"> <div class="navbar-wrapper">
<div class="container"> <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="container">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@ -63,7 +63,7 @@
</ul> </ul>
</div> </div>
</div> </div>
</div> </nav>
</div> </div>
</div> </div>

4
docs/examples/dashboard/index.html
View File

@ -29,7 +29,7 @@
<body> <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="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@ -52,7 +52,7 @@
</form> </form>
</div> </div>
</div> </div>
</div> </nav>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">

4
docs/examples/jumbotron/index.html
View File

@ -29,7 +29,7 @@
<body> <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="container">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@ -52,7 +52,7 @@
</form> </form>
</div><!--/.navbar-collapse --> </div><!--/.navbar-collapse -->
</div> </div>
</div> </nav>
<!-- Main jumbotron for a primary marketing message or call to action --> <!-- Main jumbotron for a primary marketing message or call to action -->
<div class="jumbotron"> <div class="jumbotron">

4
docs/examples/navbar-fixed-top/index.html
View File

@ -30,7 +30,7 @@
<body> <body>
<!-- Fixed navbar --> <!-- 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="container">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@ -66,7 +66,7 @@
</ul> </ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
</div> </nav>
<div class="container"> <div class="container">

4
docs/examples/navbar-static-top/index.html
View File

@ -30,7 +30,7 @@
<body> <body>
<!-- Static navbar --> <!-- 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="container">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@ -66,7 +66,7 @@
</ul> </ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
</div> </nav>
<div class="container"> <div class="container">

4
docs/examples/navbar/index.html
View File

@ -32,7 +32,7 @@
<div class="container"> <div class="container">
<!-- Static navbar --> <!-- Static navbar -->
<div class="navbar navbar-default" role="navigation"> <nav class="navbar navbar-default" role="navigation">
<div class="container-fluid"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@ -68,7 +68,7 @@
</ul> </ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div><!--/.container-fluid --> </div><!--/.container-fluid -->
</div> </nav>
<!-- Main component for a primary marketing message or call to action --> <!-- Main component for a primary marketing message or call to action -->
<div class="jumbotron"> <div class="jumbotron">

4
docs/examples/non-responsive/index.html
View File

@ -32,7 +32,7 @@
<body> <body>
<!-- Fixed navbar --> <!-- 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="container">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@ -68,7 +68,7 @@
</ul> </ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
</div> </nav>
<div class="container"> <div class="container">

4
docs/examples/offcanvas/index.html
View File

@ -28,7 +28,7 @@
</head> </head>
<body> <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="container">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@ -47,7 +47,7 @@
</ul> </ul>
</div><!-- /.nav-collapse --> </div><!-- /.nav-collapse -->
</div><!-- /.container --> </div><!-- /.container -->
</div><!-- /.navbar --> </nav><!-- /.navbar -->
<div class="container"> <div class="container">

4
docs/examples/starter-template/index.html
View File

@ -29,7 +29,7 @@
<body> <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="container">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@ -48,7 +48,7 @@
</ul> </ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
</div> </nav>
<div class="container"> <div class="container">

4
docs/examples/sticky-footer-navbar/index.html
View File

@ -30,7 +30,7 @@
<body> <body>
<!-- Fixed navbar --> <!-- 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="container">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@ -61,7 +61,7 @@
</ul> </ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
</div> </nav>
<!-- Begin page content --> <!-- Begin page content -->
<div class="container"> <div class="container">

12
docs/examples/theme/index.html
View File

@ -32,7 +32,7 @@
<body role="document"> <body role="document">
<!-- Fixed navbar --> <!-- 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="container">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@ -63,7 +63,7 @@
</ul> </ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
</div> </nav>
<div class="container theme-showcase" role="main"> <div class="container theme-showcase" role="main">
@ -378,7 +378,7 @@
<h1>Navbars</h1> <h1>Navbars</h1>
</div> </div>
<div class="navbar navbar-default"> <nav class="navbar navbar-default">
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@ -409,9 +409,9 @@
</ul> </ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
</div> </nav>
<div class="navbar navbar-inverse"> <nav class="navbar navbar-inverse">
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@ -442,7 +442,7 @@
</ul> </ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
</div> </nav>

4
js/tests/unit/scrollspy.js
View File

@ -124,12 +124,12 @@ $(function () {
test('should add the active class to the correct element', function () { test('should add the active class to the correct element', function () {
var navbarHtml = var navbarHtml =
'<div class="navbar">' '<nav class="navbar">'
+ '<ul class="nav">' + '<ul class="nav">'
+ '<li id="li-1"><a href="#div-1">div 1</a></li>' + '<li id="li-1"><a href="#div-1">div 1</a></li>'
+ '<li id="li-2"><a href="#div-2">div 2</a></li>' + '<li id="li-2"><a href="#div-2">div 2</a></li>'
+ '</ul>' + '</ul>'
+ '</div>' + '</nav>'
var contentHtml = var contentHtml =
'<div class="content" style="overflow: auto; height: 50px">' '<div class="content" style="overflow: auto; height: 50px">'
+ '<div id="div-1" style="height: 100px; padding: 0; margin: 0">div 1</div>' + '<div id="div-1" style="height: 100px; padding: 0; margin: 0">div 1</div>'