diff options
| author | Mark Otto <[email protected]> | 2012-04-14 22:43:26 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-04-14 22:43:26 -0700 |
| commit | 8dc1a0eadebb68e4e0c4523a32b1cc103e8a6d4e (patch) | |
| tree | 59707fa22f960a7a66151f91311849cae7fa089d /docs/examples | |
| parent | 490eb1bd16177f951b7c66c364d2eee6a6288a5d (diff) | |
| parent | 5b85ed181a75b286ac4e898173da7b65e20e6d8a (diff) | |
| download | bootstrap-8dc1a0eadebb68e4e0c4523a32b1cc103e8a6d4e.tar.xz bootstrap-8dc1a0eadebb68e4e0c4523a32b1cc103e8a6d4e.zip | |
Merge branch '2.0.3-wip-nav-collapse' of https://github.com/tierra/bootstrap into tierra-2.0.3-wip-nav-collapse
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/examples')
| -rw-r--r-- | docs/examples/fluid.html | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/docs/examples/fluid.html b/docs/examples/fluid.html index 651b6f2f9..f235d7614 100644 --- a/docs/examples/fluid.html +++ b/docs/examples/fluid.html @@ -44,13 +44,23 @@ <span class="icon-bar"></span> </a> <a class="brand" href="#">Project name</a> + <div class="btn-group pull-right"> + <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> + <i class="icon-user"></i> Username + <span class="caret"></span> + </a> + <ul class="dropdown-menu"> + <li><a href="#">Profile</a></li> + <li class="divider"></li> + <li><a href="#">Sign Out</a></li> + </ul> + </div> <div class="nav-collapse"> <ul class="nav"> <li class="active"><a href="#">Home</a></li> <li><a href="#about">About</a></li> <li><a href="#contact">Contact</a></li> </ul> - <p class="navbar-text pull-right">Logged in as <a class="navbar-link" href="#">username</a></p> </div><!--/.nav-collapse --> </div> </div> |