aboutsummaryrefslogtreecommitdiff
path: root/components.html
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2013-08-11 14:59:57 -0700
committerJacob Thornton <[email protected]>2013-08-11 14:59:57 -0700
commit31ab07b32aeabd8df3c7430dbb31d03b474360f5 (patch)
treea72f19e89e53e327883f4dbe679c071f1eb03a58 /components.html
parentbf2ab457eae6d54954b8e2a22596bcdd216d0ca5 (diff)
parenta88888aaeb9c0f0138abbf7824a55aa51c394ea9 (diff)
downloadbootstrap-31ab07b32aeabd8df3c7430dbb31d03b474360f5.tar.xz
bootstrap-31ab07b32aeabd8df3c7430dbb31d03b474360f5.zip
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to 'components.html')
-rw-r--r--components.html14
1 files changed, 7 insertions, 7 deletions
diff --git a/components.html b/components.html
index 27bd81ccb..8a10b21f8 100644
--- a/components.html
+++ b/components.html
@@ -1179,7 +1179,7 @@ base_url: "../"
<h3 id="navbar-fixed-top">Fixed to top</h3>
<p>Add <code>.navbar-fixed-top</code>.</p>
<div class="bs-example bs-navbar-top-example">
- <div class="navbar navbar-fixed-top">
+ <nav class="navbar navbar-fixed-top">
<div class="container" style="width: auto;">
<a class="navbar-brand" href="#">Title</a>
<ul class="nav navbar-nav">
@@ -1188,7 +1188,7 @@ base_url: "../"
<li><a href="#">Link</a></li>
</ul>
</div>
- </div>
+ </nav>
</div><!-- /example -->
{% highlight html %}
<nav class="navbar navbar-fixed-top" role="navigation">
@@ -1303,7 +1303,7 @@ body { padding-bottom: 70px; }
</ul>
</div><!-- /.nav-collapse -->
</div><!-- /.container -->
- </div><!-- /.navbar -->
+ </nav><!-- /.navbar -->
</div><!-- /example -->
{% highlight html %}
<nav class="navbar" role="navigation">
@@ -1337,7 +1337,7 @@ body { padding-bottom: 70px; }
<h2 id="navbar-scrollable">Scrollable responsive navbar</h2>
<p>For instances where you have too many items in your navbar to fight within the viewport of a small device, add <code>.nav-collapse-scrollable</code> to your navbar's <code>.nav-collapse</code> to set a <code>max-height</code> and smooth scrolling.</p>
<div class="bs-example">
- <div class="navbar">
+ <nav class="navbar">
<div class="container">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".bs-navbar-scroll-collapse">
<span class="icon-bar"></span>
@@ -1360,10 +1360,10 @@ body { padding-bottom: 70px; }
</form>
</div><!-- /.nav-collapse -->
</div><!-- /.container -->
- </div><!-- /.navbar -->
+ </nav><!-- /.navbar -->
</div><!-- /example -->
{% highlight html %}
-<div class="navbar">
+<nav class="navbar">
<div class="container">
...
@@ -1372,7 +1372,7 @@ body { padding-bottom: 70px; }
</div><!-- /.nav-collapse -->
</div><!-- /.container -->
-</div><!-- /.navbar -->
+</nav><!-- /.navbar -->
{% endhighlight %}