aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-17 21:00:13 -0700
committerMark Otto <[email protected]>2013-08-17 21:00:13 -0700
commit5539db523743c177a2ebb7d878343776abf6b7b4 (patch)
treea695233b9319eee5c45e3225c8c91712b56b45f3 /examples
parentb413aff0458a9a2c1afdd6a66b1a58eef62c30b0 (diff)
downloadbootstrap-5539db523743c177a2ebb7d878343776abf6b7b4.tar.xz
bootstrap-5539db523743c177a2ebb7d878343776abf6b7b4.zip
Navbar update
Addresses a few different cases where the navbar has and doesn't have a container, and accordingly adjusts the padding and margin of key elements.
Diffstat (limited to 'examples')
-rw-r--r--examples/navbar/index.html64
1 files changed, 31 insertions, 33 deletions
diff --git a/examples/navbar/index.html b/examples/navbar/index.html
index b1734da83..ac779e47a 100644
--- a/examples/navbar/index.html
+++ b/examples/navbar/index.html
@@ -22,40 +22,38 @@
<!-- Static navbar -->
<div class="navbar">
- <div class="container">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a class="navbar-brand" href="#">Project name</a>
- </div>
- <div class="navbar-collapse collapse">
- <ul class="nav navbar-nav">
- <li class="active"><a href="#">Home</a></li>
- <li><a href="#about">About</a></li>
- <li><a href="#contact">Contact</a></li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li class="dropdown-header">Nav header</li>
- <li><a href="#">Separated link</a></li>
- <li><a href="#">One more separated link</a></li>
- </ul>
- </li>
- </ul>
- <ul class="nav navbar-nav navbar-right">
- <li class="active"><a href="./">Default</a></li>
- <li><a href="../navbar-static-top/">Static top</a></li>
- <li><a href="../navbar-fixed-top/">Fixed top</a></li>
- </ul>
- </div><!--/.nav-collapse -->
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="#">Project name</a>
</div>
+ <div class="navbar-collapse collapse">
+ <ul class="nav navbar-nav">
+ <li class="active"><a href="#">Link</a></li>
+ <li><a href="#">Link</a></li>
+ <li><a href="#">Link</a></li>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="#">Action</a></li>
+ <li><a href="#">Another action</a></li>
+ <li><a href="#">Something else here</a></li>
+ <li class="divider"></li>
+ <li class="dropdown-header">Nav header</li>
+ <li><a href="#">Separated link</a></li>
+ <li><a href="#">One more separated link</a></li>
+ </ul>
+ </li>
+ </ul>
+ <ul class="nav navbar-nav navbar-right">
+ <li class="active"><a href="./">Default</a></li>
+ <li><a href="../navbar-static-top/">Static top</a></li>
+ <li><a href="../navbar-fixed-top/">Fixed top</a></li>
+ </ul>
+ </div><!--/.nav-collapse -->
</div>
<!-- Main component for a primary marketing message or call to action -->