diff options
| author | Jacob Thornton <[email protected]> | 2012-08-20 16:13:46 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-08-20 16:13:46 -0700 |
| commit | 5d63e8e2a84468351b4c1ee6cc21f48e95ea27bf (patch) | |
| tree | 2d760c794e61c15850d14d5eee1c565ab4f9a871 /docs/examples/fluid.html | |
| parent | 5df1e2c00a295c45db7fa75dba333dc9464b128c (diff) | |
| parent | aa2cec6f2f706f8c1754f8bf79a8c9f094445bd8 (diff) | |
| download | bootstrap-5d63e8e2a84468351b4c1ee6cc21f48e95ea27bf.tar.xz bootstrap-5d63e8e2a84468351b4c1ee6cc21f48e95ea27bf.zip | |
fMerge branch '2.1.0-wip'
Conflicts:
docs/index.html
Diffstat (limited to 'docs/examples/fluid.html')
| -rw-r--r-- | docs/examples/fluid.html | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/docs/examples/fluid.html b/docs/examples/fluid.html index f235d7614..24ea26582 100644 --- a/docs/examples/fluid.html +++ b/docs/examples/fluid.html @@ -35,7 +35,7 @@ <body> - <div class="navbar navbar-fixed-top"> + <div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar-inner"> <div class="container-fluid"> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> @@ -44,18 +44,10 @@ <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"> + <div class="nav-collapse collapse"> + <p class="navbar-text pull-right"> + Logged in as <a href="#" class="navbar-link">Username</a> + </p> <ul class="nav"> <li class="active"><a href="#">Home</a></li> <li><a href="#about">About</a></li> |