0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00

Remove .navbar-inner from navbar tests

This commit is contained in:
Mark Otto 2012-11-30 12:36:55 -08:00
parent 7313702cf3
commit 030a058174
3 changed files with 92 additions and 98 deletions

View File

@ -34,39 +34,37 @@
<!-- Fixed navbar --> <!-- Fixed navbar -->
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
<div class="navbar-inner"> <div class="container">
<div class="container"> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> </a>
</a> <a class="brand" href="#">Project name</a>
<a class="brand" href="#">Project name</a> <div class="nav-collapse collapse">
<div class="nav-collapse collapse"> <ul class="nav">
<ul class="nav"> <li class="active"><a href="#">Home</a></li>
<li class="active"><a href="#">Home</a></li> <li><a href="#about">About</a></li>
<li><a href="#about">About</a></li> <li><a href="#contact">Contact</a></li>
<li><a href="#contact">Contact</a></li> <li class="dropdown">
<li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> <ul class="dropdown-menu">
<ul class="dropdown-menu"> <li><a href="#">Action</a></li>
<li><a href="#">Action</a></li> <li><a href="#">Another action</a></li>
<li><a href="#">Another action</a></li> <li><a href="#">Something else here</a></li>
<li><a href="#">Something else here</a></li> <li class="divider"></li>
<li class="divider"></li> <li class="nav-header">Nav header</li>
<li class="nav-header">Nav header</li> <li><a href="#">Separated link</a></li>
<li><a href="#">Separated link</a></li> <li><a href="#">One more separated link</a></li>
<li><a href="#">One more separated link</a></li> </ul>
</ul> </li>
</li> </ul>
</ul> <ul class="nav pull-right">
<ul class="nav pull-right"> <li><a href="./navbar.html">Default</a></li>
<li><a href="./navbar.html">Default</a></li> <li><a href="./navbar-static-top.html">Static top</a></li>
<li><a href="./navbar-static-top.html">Static top</a></li> <li class="active"><a href="./navbar-fixed-top.html">Fixed top</a></li>
<li class="active"><a href="./navbar-fixed-top.html">Fixed top</a></li> </ul>
</ul> </div><!--/.nav-collapse -->
</div><!--/.nav-collapse -->
</div>
</div> </div>
</div> </div>

View File

@ -36,39 +36,37 @@
<!-- Static navbar --> <!-- Static navbar -->
<div class="navbar navbar-static-top"> <div class="navbar navbar-static-top">
<div class="navbar-inner"> <div class="container">
<div class="container"> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> </a>
</a> <a class="brand" href="#">Project name</a>
<a class="brand" href="#">Project name</a> <div class="nav-collapse collapse">
<div class="nav-collapse collapse"> <ul class="nav">
<ul class="nav"> <li class="active"><a href="#">Home</a></li>
<li class="active"><a href="#">Home</a></li> <li><a href="#about">About</a></li>
<li><a href="#about">About</a></li> <li><a href="#contact">Contact</a></li>
<li><a href="#contact">Contact</a></li> <li class="dropdown">
<li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> <ul class="dropdown-menu">
<ul class="dropdown-menu"> <li><a href="#">Action</a></li>
<li><a href="#">Action</a></li> <li><a href="#">Another action</a></li>
<li><a href="#">Another action</a></li> <li><a href="#">Something else here</a></li>
<li><a href="#">Something else here</a></li> <li class="divider"></li>
<li class="divider"></li> <li class="nav-header">Nav header</li>
<li class="nav-header">Nav header</li> <li><a href="#">Separated link</a></li>
<li><a href="#">Separated link</a></li> <li><a href="#">One more separated link</a></li>
<li><a href="#">One more separated link</a></li> </ul>
</ul> </li>
</li>
</ul>
<ul class="nav pull-right">
<li><a href="./navbar.html">Default</a></li>
<li class="active"><a href="./navbar-static-top.html">Static top</a></li>
<li><a href="./navbar-fixed-top.html">Fixed top</a></li>
</ul> </ul>
</div><!--/.nav-collapse --> <ul class="nav pull-right">
</div> <li><a href="./navbar.html">Default</a></li>
<li class="active"><a href="./navbar-static-top.html">Static top</a></li>
<li><a href="./navbar-fixed-top.html">Fixed top</a></li>
</ul>
</div><!--/.nav-collapse -->
</div> </div>
</div> </div>

View File

@ -39,39 +39,37 @@
<!-- Static navbar --> <!-- Static navbar -->
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <div class="container">
<div class="container"> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> </a>
</a> <a class="brand" href="#">Project name</a>
<a class="brand" href="#">Project name</a> <div class="nav-collapse collapse">
<div class="nav-collapse collapse"> <ul class="nav">
<ul class="nav"> <li class="active"><a href="#">Home</a></li>
<li class="active"><a href="#">Home</a></li> <li><a href="#about">About</a></li>
<li><a href="#about">About</a></li> <li><a href="#contact">Contact</a></li>
<li><a href="#contact">Contact</a></li> <li class="dropdown">
<li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> <ul class="dropdown-menu">
<ul class="dropdown-menu"> <li><a href="#">Action</a></li>
<li><a href="#">Action</a></li> <li><a href="#">Another action</a></li>
<li><a href="#">Another action</a></li> <li><a href="#">Something else here</a></li>
<li><a href="#">Something else here</a></li> <li class="divider"></li>
<li class="divider"></li> <li class="nav-header">Nav header</li>
<li class="nav-header">Nav header</li> <li><a href="#">Separated link</a></li>
<li><a href="#">Separated link</a></li> <li><a href="#">One more separated link</a></li>
<li><a href="#">One more separated link</a></li> </ul>
</ul> </li>
</li> </ul>
</ul> <ul class="nav pull-right">
<ul class="nav pull-right"> <li class="active"><a href="./navbar.html">Default</a></li>
<li class="active"><a href="./navbar.html">Default</a></li> <li><a href="./navbar-static-top.html">Static top</a></li>
<li><a href="./navbar-static-top.html">Static top</a></li> <li><a href="./navbar-fixed-top.html">Fixed top</a></li>
<li><a href="./navbar-fixed-top.html">Fixed top</a></li> </ul>
</ul> </div><!--/.nav-collapse -->
</div><!--/.nav-collapse -->
</div>
</div> </div>
</div> </div>