1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 13:38:26 +01:00

initial pass at removing navbar-inner from .navbar component

This commit is contained in:
Mark Otto 2012-09-25 22:48:02 -07:00
parent f12946be5a
commit c59e5251e1
15 changed files with 604 additions and 727 deletions

View File

@ -590,8 +590,8 @@
.navbar-fixed-bottom { .navbar-fixed-bottom {
margin-top: 20px; margin-top: 20px;
} }
.navbar-fixed-top .navbar-inner, .navbar-fixed-top,
.navbar-fixed-bottom .navbar-inner { .navbar-fixed-bottom {
padding: 5px; padding: 5px;
} }
.navbar .container { .navbar .container {
@ -711,7 +711,7 @@
.navbar .btn-navbar { .navbar .btn-navbar {
display: block; display: block;
} }
.navbar-static .navbar-inner { .navbar-static {
padding-right: 10px; padding-right: 10px;
padding-left: 10px; padding-left: 10px;
} }

View File

@ -4046,40 +4046,28 @@ input[type="submit"].btn::-moz-focus-inner {
} }
.navbar { .navbar {
padding: 0 20px;
margin-bottom: 20px; margin-bottom: 20px;
overflow: visible; overflow: visible;
color: #777777; color: #777777;
} background-color: #f2f2f2;
.navbar-inner {
min-height: 40px;
padding-right: 20px;
padding-left: 20px;
background-color: #fafafa;
background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
background-repeat: repeat-x;
border: 1px solid #d4d4d4; border: 1px solid #d4d4d4;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
} }
.navbar-inner:before, .navbar:before,
.navbar-inner:after { .navbar:after {
display: table; display: table;
line-height: 0; line-height: 0;
content: ""; content: "";
} }
.navbar-inner:after { .navbar:after {
clear: both; clear: both;
} }
@ -4206,9 +4194,6 @@ input[type="submit"].btn::-moz-focus-inner {
.navbar-static-top { .navbar-static-top {
position: static; position: static;
margin-bottom: 0; margin-bottom: 0;
}
.navbar-static-top .navbar-inner {
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
border-radius: 0; border-radius: 0;
@ -4220,27 +4205,19 @@ input[type="submit"].btn::-moz-focus-inner {
right: 0; right: 0;
left: 0; left: 0;
z-index: 1030; z-index: 1030;
margin-bottom: 0;
}
.navbar-fixed-top .navbar-inner,
.navbar-static-top .navbar-inner {
border-width: 0 0 1px;
}
.navbar-fixed-bottom .navbar-inner {
border-width: 1px 0 0;
}
.navbar-fixed-top .navbar-inner,
.navbar-fixed-bottom .navbar-inner {
padding-right: 0; padding-right: 0;
padding-left: 0; padding-left: 0;
margin-bottom: 0;
border-width: 0 0 1px;
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
border-radius: 0; border-radius: 0;
} }
.navbar-fixed-bottom {
border-width: 1px 0 0;
}
.navbar-static-top .container, .navbar-static-top .container,
.navbar-fixed-top .container, .navbar-fixed-top .container,
.navbar-fixed-bottom .container { .navbar-fixed-bottom .container {
@ -4251,8 +4228,8 @@ input[type="submit"].btn::-moz-focus-inner {
top: 0; top: 0;
} }
.navbar-fixed-top .navbar-inner, .navbar-fixed-top,
.navbar-static-top .navbar-inner { .navbar-static-top {
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
-moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
@ -4260,9 +4237,6 @@ input[type="submit"].btn::-moz-focus-inner {
.navbar-fixed-bottom { .navbar-fixed-bottom {
bottom: 0; bottom: 0;
}
.navbar-fixed-bottom .navbar-inner {
-webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1); -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
-moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
@ -4459,18 +4433,8 @@ input[type="submit"].btn::-moz-focus-inner {
.navbar-inverse { .navbar-inverse {
color: #999999; color: #999999;
} background-color: #111111;
.navbar-inverse .navbar-inner {
background-color: #1b1b1b;
background-image: -moz-linear-gradient(top, #222222, #111111);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
background-image: -webkit-linear-gradient(top, #222222, #111111);
background-image: -o-linear-gradient(top, #222222, #111111);
background-image: linear-gradient(to bottom, #222222, #111111);
background-repeat: repeat-x;
border-color: #252525; border-color: #252525;
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
} }
.navbar-inverse .brand, .navbar-inverse .brand,

View File

@ -28,6 +28,7 @@ h3 code {
body > .navbar { body > .navbar {
font-size: 13px; font-size: 13px;
background-color: rgba(0,0,0,.9);
} }
/* Change the docs' brand */ /* Change the docs' brand */

View File

@ -32,39 +32,37 @@
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner"> <div class="container">
<div class="container"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<button type="button" 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> </button>
</button> <a class="brand" href="./index.html">Bootstrap</a>
<a class="brand" href="./index.html">Bootstrap</a> <div class="nav-collapse collapse">
<div class="nav-collapse collapse"> <ul class="nav">
<ul class="nav"> <li class="">
<li class=""> <a href="./index.html">Home</a>
<a href="./index.html">Home</a> </li>
</li> <li class="">
<li class=""> <a href="./getting-started.html">Get started</a>
<a href="./getting-started.html">Get started</a> </li>
</li> <li class="">
<li class=""> <a href="./scaffolding.html">Scaffolding</a>
<a href="./scaffolding.html">Scaffolding</a> </li>
</li> <li class="active">
<li class="active"> <a href="./base-css.html">Base CSS</a>
<a href="./base-css.html">Base CSS</a> </li>
</li> <li class="">
<li class=""> <a href="./components.html">Components</a>
<a href="./components.html">Components</a> </li>
</li> <li class="">
<li class=""> <a href="./javascript.html">JavaScript</a>
<a href="./javascript.html">JavaScript</a> </li>
</li> <li class="">
<li class=""> <a href="./customize.html">Customize</a>
<a href="./customize.html">Customize</a> </li>
</li> </ul>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>

View File

@ -32,39 +32,37 @@
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner"> <div class="container">
<div class="container"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<button type="button" 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> </button>
</button> <a class="brand" href="./index.html">Bootstrap</a>
<a class="brand" href="./index.html">Bootstrap</a> <div class="nav-collapse collapse">
<div class="nav-collapse collapse"> <ul class="nav">
<ul class="nav"> <li class="">
<li class=""> <a href="./index.html">Home</a>
<a href="./index.html">Home</a> </li>
</li> <li class="">
<li class=""> <a href="./getting-started.html">Get started</a>
<a href="./getting-started.html">Get started</a> </li>
</li> <li class="">
<li class=""> <a href="./scaffolding.html">Scaffolding</a>
<a href="./scaffolding.html">Scaffolding</a> </li>
</li> <li class="">
<li class=""> <a href="./base-css.html">Base CSS</a>
<a href="./base-css.html">Base CSS</a> </li>
</li> <li class="active">
<li class="active"> <a href="./components.html">Components</a>
<a href="./components.html">Components</a> </li>
</li> <li class="">
<li class=""> <a href="./javascript.html">JavaScript</a>
<a href="./javascript.html">JavaScript</a> </li>
</li> <li class="">
<li class=""> <a href="./customize.html">Customize</a>
<a href="./customize.html">Customize</a> </li>
</li> </ul>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -1031,26 +1029,22 @@
<p>To start, navbars are static (not fixed to the top) and include support for a project name and basic navigation. Place one anywhere within a <code>.container</code>, which sets the width of your site and content.</p> <p>To start, navbars are static (not fixed to the top) and include support for a project name and basic navigation. Place one anywhere within a <code>.container</code>, which sets the width of your site and content.</p>
<div class="bs-docs-example"> <div class="bs-docs-example">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <a class="brand" href="#">Title</a>
<a class="brand" href="#">Title</a> <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="#">Link</a></li>
<li><a href="#">Link</a></li> <li><a href="#">Link</a></li>
<li><a href="#">Link</a></li> </ul>
</ul>
</div>
</div> </div>
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div class="navbar"&gt; &lt;div class="navbar"&gt;
&lt;div class="navbar-inner"&gt; &lt;a class="brand" href="#"&gt;Title&lt;/a&gt;
&lt;a class="brand" href="#"&gt;Title&lt;/a&gt; &lt;ul class="nav"&gt;
&lt;ul class="nav"&gt; &lt;li class="active"&gt;&lt;a href="#"&gt;Home&lt;/a&gt;&lt;/li&gt;
&lt;li class="active"&gt;&lt;a href="#"&gt;Home&lt;/a&gt;&lt;/li&gt; &lt;li&gt;&lt;a href="#"&gt;Link&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href="#"&gt;Link&lt;/a&gt;&lt;/li&gt; &lt;li&gt;&lt;a href="#"&gt;Link&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href="#"&gt;Link&lt;/a&gt;&lt;/li&gt; &lt;/ul&gt;
&lt;/ul&gt;
&lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
@ -1064,9 +1058,7 @@
<p>A simple link to show your brand or project name only requires an anchor tag.</p> <p>A simple link to show your brand or project name only requires an anchor tag.</p>
<div class="bs-docs-example"> <div class="bs-docs-example">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <a class="brand" href="#">Title</a>
<a class="brand" href="#">Title</a>
</div>
</div> </div>
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
@ -1077,13 +1069,11 @@
<p>Nav items are simple to add via unordered lists.</p> <p>Nav items are simple to add via unordered lists.</p>
<div class="bs-docs-example"> <div class="bs-docs-example">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <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="#">Link</a></li>
<li><a href="#">Link</a></li> <li><a href="#">Link</a></li>
<li><a href="#">Link</a></li> </ul>
</ul>
</div>
</div> </div>
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
@ -1122,12 +1112,10 @@
<p>To properly style and position a form within the navbar, add the appropriate classes as shown below. For a default form, include <code>.navbar-form</code> and either <code>.pull-left</code> or <code>.pull-right</code> to properly align it.</p> <p>To properly style and position a form within the navbar, add the appropriate classes as shown below. For a default form, include <code>.navbar-form</code> and either <code>.pull-left</code> or <code>.pull-right</code> to properly align it.</p>
<div class="bs-docs-example"> <div class="bs-docs-example">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <form class="navbar-form pull-left">
<form class="navbar-form pull-left"> <input type="text" class="span2">
<input type="text" class="span2"> <button type="submit" class="btn">Submit</button>
<button type="submit" class="btn">Submit</button> </form>
</form>
</div>
</div> </div>
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
@ -1141,11 +1129,9 @@
<p>For a more customized search form, add <code>.navbar-search</code> to the <code>form</code> and <code>.search-query</code> to the input for specialized styles in the navbar.</p> <p>For a more customized search form, add <code>.navbar-search</code> to the <code>form</code> and <code>.search-query</code> to the input for specialized styles in the navbar.</p>
<div class="bs-docs-example"> <div class="bs-docs-example">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <form class="navbar-search pull-left">
<form class="navbar-search pull-left"> <input type="text" class="search-query" placeholder="Search">
<input type="text" class="search-query" placeholder="Search"> </form>
</form>
</div>
</div> </div>
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
@ -1188,15 +1174,13 @@
<p>Add <code>.navbar-fixed-top</code> and remember to account for the hidden area underneath it by adding at least 40px <code>padding</code> to the <code>&lt;body&gt;</code>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.</p> <p>Add <code>.navbar-fixed-top</code> and remember to account for the hidden area underneath it by adding at least 40px <code>padding</code> to the <code>&lt;body&gt;</code>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.</p>
<div class="bs-docs-example bs-navbar-top-example"> <div class="bs-docs-example bs-navbar-top-example">
<div class="navbar navbar-fixed-top" style="position: absolute;"> <div class="navbar navbar-fixed-top" style="position: absolute;">
<div class="navbar-inner"> <div class="container" style="width: auto;">
<div class="container" style="width: auto; padding: 0 20px;"> <a class="brand" href="#">Title</a>
<a class="brand" href="#">Title</a> <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="#">Link</a></li>
<li><a href="#">Link</a></li> <li><a href="#">Link</a></li>
<li><a href="#">Link</a></li> </ul>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -1210,15 +1194,13 @@
<p>Add <code>.navbar-fixed-bottom</code> instead.</p> <p>Add <code>.navbar-fixed-bottom</code> instead.</p>
<div class="bs-docs-example bs-navbar-bottom-example"> <div class="bs-docs-example bs-navbar-bottom-example">
<div class="navbar navbar-fixed-bottom" style="position: absolute;"> <div class="navbar navbar-fixed-bottom" style="position: absolute;">
<div class="navbar-inner"> <div class="container" style="width: auto;">
<div class="container" style="width: auto; padding: 0 20px;"> <a class="brand" href="#">Title</a>
<a class="brand" href="#">Title</a> <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="#">Link</a></li>
<li><a href="#">Link</a></li> <li><a href="#">Link</a></li>
<li><a href="#">Link</a></li> </ul>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -1232,15 +1214,13 @@
<p>Create a full-width navbar that scrolls away with the page by adding <code>.navbar-static-top</code>. Unlike the <code>.navbar-fixed-top</code> class, you do not need to change any padding on the <code>body</code>.</p> <p>Create a full-width navbar that scrolls away with the page by adding <code>.navbar-static-top</code>. Unlike the <code>.navbar-fixed-top</code> class, you do not need to change any padding on the <code>body</code>.</p>
<div class="bs-docs-example bs-navbar-top-example"> <div class="bs-docs-example bs-navbar-top-example">
<div class="navbar navbar-static-top" style="margin: -1px -1px 0;"> <div class="navbar navbar-static-top" style="margin: -1px -1px 0;">
<div class="navbar-inner"> <div class="container" style="width: auto;">
<div class="container" style="width: auto; padding: 0 20px;"> <a class="brand" href="#">Title</a>
<a class="brand" href="#">Title</a> <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="#">Link</a></li>
<li><a href="#">Link</a></li> <li><a href="#">Link</a></li>
<li><a href="#">Link</a></li> </ul>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -1258,75 +1238,71 @@
<p>To implement a collapsing responsive navbar, wrap your navbar content in a containing div, <code>.nav-collapse.collapse</code>, and add the navbar toggle button, <code>.btn-navbar</code>.</p> <p>To implement a collapsing responsive navbar, wrap your navbar content in a containing div, <code>.nav-collapse.collapse</code>, and add the navbar toggle button, <code>.btn-navbar</code>.</p>
<div class="bs-docs-example"> <div class="bs-docs-example">
<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="#">Title</a>
<a class="brand" href="#">Title</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="#">Link</a></li>
<li><a href="#">Link</a></li> <li><a href="#">Link</a></li>
<li><a href="#">Link</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> <form class="navbar-search pull-left" action="">
<form class="navbar-search pull-left" action=""> <input type="text" class="search-query span2" placeholder="Search">
<input type="text" class="search-query span2" placeholder="Search"> </form>
</form> <ul class="nav pull-right">
<ul class="nav pull-right"> <li><a href="#">Link</a></li>
<li><a href="#">Link</a></li> <li class="divider-vertical"></li>
<li class="divider-vertical"></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><a href="#">Separated link</a></li>
<li><a href="#">Separated link</a></li> </ul>
</ul> </li>
</li> </ul>
</ul> </div><!-- /.nav-collapse -->
</div><!-- /.nav-collapse --> </div>
</div>
</div><!-- /navbar-inner -->
</div><!-- /navbar --> </div><!-- /navbar -->
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div class="navbar"&gt; &lt;div class="navbar"&gt;
&lt;div class="navbar-inner"&gt; &lt;div class="container"&gt;
&lt;div class="container"&gt;
&lt;!-- .btn-navbar is used as the toggle for collapsed navbar content --&gt; &lt;!-- .btn-navbar is used as the toggle for collapsed navbar content --&gt;
&lt;a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"&gt; &lt;a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"&gt;
&lt;span class="icon-bar"&gt;&lt;/span&gt; &lt;span class="icon-bar"&gt;&lt;/span&gt;
&lt;span class="icon-bar"&gt;&lt;/span&gt; &lt;span class="icon-bar"&gt;&lt;/span&gt;
&lt;span class="icon-bar"&gt;&lt;/span&gt; &lt;span class="icon-bar"&gt;&lt;/span&gt;
&lt;/a&gt; &lt;/a&gt;
&lt;!-- Be sure to leave the brand out there if you want it shown --&gt; &lt;!-- Be sure to leave the brand out there if you want it shown --&gt;
&lt;a class="brand" href="#"&gt;Project name&lt;/a&gt; &lt;a class="brand" href="#"&gt;Project name&lt;/a&gt;
&lt;!-- Everything you want hidden at 940px or less, place within here --&gt;
&lt;div class="nav-collapse collapse"&gt;
&lt;!-- .nav, .navbar-search, .navbar-form, etc --&gt;
&lt;/div&gt;
&lt;!-- Everything you want hidden at 940px or less, place within here --&gt;
&lt;div class="nav-collapse collapse"&gt;
&lt;!-- .nav, .navbar-search, .navbar-form, etc --&gt;
&lt;/div&gt; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
@ -1342,52 +1318,50 @@
<p>Modify the look of the navbar by adding <code>.navbar-inverse</code>.</p> <p>Modify the look of the navbar by adding <code>.navbar-inverse</code>.</p>
<div class="bs-docs-example"> <div class="bs-docs-example">
<div class="navbar navbar-inverse" style="position: static;"> <div class="navbar navbar-inverse" style="position: static;">
<div class="navbar-inner"> <div class="container">
<div class="container"> <a class="btn btn-navbar" data-toggle="collapse" data-target=".subnav-collapse">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".subnav-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="#">Title</a>
<a class="brand" href="#">Title</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="#">Link</a></li>
<li><a href="#">Link</a></li> <li><a href="#">Link</a></li>
<li><a href="#">Link</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> <form class="navbar-search pull-left" action="">
<form class="navbar-search pull-left" action=""> <input type="text" class="search-query span2" placeholder="Search">
<input type="text" class="search-query span2" placeholder="Search"> </form>
</form> <ul class="nav pull-right">
<ul class="nav pull-right"> <li><a href="#">Link</a></li>
<li><a href="#">Link</a></li> <li class="divider-vertical"></li>
<li class="divider-vertical"></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><a href="#">Separated link</a></li>
<li><a href="#">Separated link</a></li> </ul>
</ul> </li>
</li> </ul>
</ul> </div><!-- /.nav-collapse -->
</div><!-- /.nav-collapse --> </div>
</div>
</div><!-- /navbar-inner -->
</div><!-- /navbar --> </div><!-- /navbar -->
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">

View File

@ -32,39 +32,37 @@
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner"> <div class="container">
<div class="container"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<button type="button" 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> </button>
</button> <a class="brand" href="./index.html">Bootstrap</a>
<a class="brand" href="./index.html">Bootstrap</a> <div class="nav-collapse collapse">
<div class="nav-collapse collapse"> <ul class="nav">
<ul class="nav"> <li class="">
<li class=""> <a href="./index.html">Home</a>
<a href="./index.html">Home</a> </li>
</li> <li class="">
<li class=""> <a href="./getting-started.html">Get started</a>
<a href="./getting-started.html">Get started</a> </li>
</li> <li class="">
<li class=""> <a href="./scaffolding.html">Scaffolding</a>
<a href="./scaffolding.html">Scaffolding</a> </li>
</li> <li class="">
<li class=""> <a href="./base-css.html">Base CSS</a>
<a href="./base-css.html">Base CSS</a> </li>
</li> <li class="">
<li class=""> <a href="./components.html">Components</a>
<a href="./components.html">Components</a> </li>
</li> <li class="">
<li class=""> <a href="./javascript.html">JavaScript</a>
<a href="./javascript.html">JavaScript</a> </li>
</li> <li class="active">
<li class="active"> <a href="./customize.html">Customize</a>
<a href="./customize.html">Customize</a> </li>
</li> </ul>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>

View File

@ -32,39 +32,37 @@
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner"> <div class="container">
<div class="container"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<button type="button" 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> </button>
</button> <a class="brand" href="./index.html">Bootstrap</a>
<a class="brand" href="./index.html">Bootstrap</a> <div class="nav-collapse collapse">
<div class="nav-collapse collapse"> <ul class="nav">
<ul class="nav"> <li class="">
<li class=""> <a href="./index.html">Home</a>
<a href="./index.html">Home</a> </li>
</li> <li class="">
<li class=""> <a href="./getting-started.html">Get started</a>
<a href="./getting-started.html">Get started</a> </li>
</li> <li class="">
<li class=""> <a href="./scaffolding.html">Scaffolding</a>
<a href="./scaffolding.html">Scaffolding</a> </li>
</li> <li class="">
<li class=""> <a href="./base-css.html">Base CSS</a>
<a href="./base-css.html">Base CSS</a> </li>
</li> <li class="">
<li class=""> <a href="./components.html">Components</a>
<a href="./components.html">Components</a> </li>
</li> <li class="">
<li class=""> <a href="./javascript.html">JavaScript</a>
<a href="./javascript.html">JavaScript</a> </li>
</li> <li class="">
<li class=""> <a href="./customize.html">Customize</a>
<a href="./customize.html">Customize</a> </li>
</li> </ul>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>

View File

@ -32,39 +32,37 @@
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner"> <div class="container">
<div class="container"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<button type="button" 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> </button>
</button> <a class="brand" href="./index.html">Bootstrap</a>
<a class="brand" href="./index.html">Bootstrap</a> <div class="nav-collapse collapse">
<div class="nav-collapse collapse"> <ul class="nav">
<ul class="nav"> <li class="">
<li class=""> <a href="./index.html">Home</a>
<a href="./index.html">Home</a> </li>
</li> <li class="active">
<li class="active"> <a href="./getting-started.html">Get started</a>
<a href="./getting-started.html">Get started</a> </li>
</li> <li class="">
<li class=""> <a href="./scaffolding.html">Scaffolding</a>
<a href="./scaffolding.html">Scaffolding</a> </li>
</li> <li class="">
<li class=""> <a href="./base-css.html">Base CSS</a>
<a href="./base-css.html">Base CSS</a> </li>
</li> <li class="">
<li class=""> <a href="./components.html">Components</a>
<a href="./components.html">Components</a> </li>
</li> <li class="">
<li class=""> <a href="./javascript.html">JavaScript</a>
<a href="./javascript.html">JavaScript</a> </li>
</li> <li class="">
<li class=""> <a href="./customize.html">Customize</a>
<a href="./customize.html">Customize</a> </li>
</li> </ul>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>

View File

@ -32,39 +32,37 @@
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner"> <div class="container">
<div class="container"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<button type="button" 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> </button>
</button> <a class="brand" href="./index.html">Bootstrap</a>
<a class="brand" href="./index.html">Bootstrap</a> <div class="nav-collapse collapse">
<div class="nav-collapse collapse"> <ul class="nav">
<ul class="nav"> <li class="active">
<li class="active"> <a href="./index.html">Home</a>
<a href="./index.html">Home</a> </li>
</li> <li class="">
<li class=""> <a href="./getting-started.html">Get started</a>
<a href="./getting-started.html">Get started</a> </li>
</li> <li class="">
<li class=""> <a href="./scaffolding.html">Scaffolding</a>
<a href="./scaffolding.html">Scaffolding</a> </li>
</li> <li class="">
<li class=""> <a href="./base-css.html">Base CSS</a>
<a href="./base-css.html">Base CSS</a> </li>
</li> <li class="">
<li class=""> <a href="./components.html">Components</a>
<a href="./components.html">Components</a> </li>
</li> <li class="">
<li class=""> <a href="./javascript.html">JavaScript</a>
<a href="./javascript.html">JavaScript</a> </li>
</li> <li class="">
<li class=""> <a href="./customize.html">Customize</a>
<a href="./customize.html">Customize</a> </li>
</li> </ul>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>

View File

@ -32,39 +32,37 @@
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner"> <div class="container">
<div class="container"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<button type="button" 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> </button>
</button> <a class="brand" href="./index.html">Bootstrap</a>
<a class="brand" href="./index.html">Bootstrap</a> <div class="nav-collapse collapse">
<div class="nav-collapse collapse"> <ul class="nav">
<ul class="nav"> <li class="">
<li class=""> <a href="./index.html">Home</a>
<a href="./index.html">Home</a> </li>
</li> <li class="">
<li class=""> <a href="./getting-started.html">Get started</a>
<a href="./getting-started.html">Get started</a> </li>
</li> <li class="">
<li class=""> <a href="./scaffolding.html">Scaffolding</a>
<a href="./scaffolding.html">Scaffolding</a> </li>
</li> <li class="">
<li class=""> <a href="./base-css.html">Base CSS</a>
<a href="./base-css.html">Base CSS</a> </li>
</li> <li class="">
<li class=""> <a href="./components.html">Components</a>
<a href="./components.html">Components</a> </li>
</li> <li class="active">
<li class="active"> <a href="./javascript.html">JavaScript</a>
<a href="./javascript.html">JavaScript</a> </li>
</li> <li class="">
<li class=""> <a href="./customize.html">Customize</a>
<a href="./customize.html">Customize</a> </li>
</li> </ul>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>

View File

@ -32,39 +32,37 @@
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner"> <div class="container">
<div class="container"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<button type="button" 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> </button>
</button> <a class="brand" href="./index.html">Bootstrap</a>
<a class="brand" href="./index.html">Bootstrap</a> <div class="nav-collapse collapse">
<div class="nav-collapse collapse"> <ul class="nav">
<ul class="nav"> <li class="">
<li class=""> <a href="./index.html">Home</a>
<a href="./index.html">Home</a> </li>
</li> <li class="">
<li class=""> <a href="./getting-started.html">Get started</a>
<a href="./getting-started.html">Get started</a> </li>
</li> <li class="active">
<li class="active"> <a href="./scaffolding.html">Scaffolding</a>
<a href="./scaffolding.html">Scaffolding</a> </li>
</li> <li class="">
<li class=""> <a href="./base-css.html">Base CSS</a>
<a href="./base-css.html">Base CSS</a> </li>
</li> <li class="">
<li class=""> <a href="./components.html">Components</a>
<a href="./components.html">Components</a> </li>
</li> <li class="">
<li class=""> <a href="./javascript.html">JavaScript</a>
<a href="./javascript.html">JavaScript</a> </li>
</li> <li class="">
<li class=""> <a href="./customize.html">Customize</a>
<a href="./customize.html">Customize</a> </li>
</li> </ul>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>

View File

@ -44,39 +44,37 @@
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner"> <div class="container">
<div class="container"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<button type="button" 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> </button>
</button> <a class="brand" href="./index.html">Bootstrap</a>
<a class="brand" href="./index.html">Bootstrap</a> <div class="nav-collapse collapse">
<div class="nav-collapse collapse"> <ul class="nav">
<ul class="nav"> <li class="{{index}}">
<li class="{{index}}"> <a href="./index.html">{{_i}}Home{{/i}}</a>
<a href="./index.html">{{_i}}Home{{/i}}</a> </li>
</li> <li class="{{getting-started}}">
<li class="{{getting-started}}"> <a href="./getting-started.html">{{_i}}Get started{{/i}}</a>
<a href="./getting-started.html">{{_i}}Get started{{/i}}</a> </li>
</li> <li class="{{scaffolding}}">
<li class="{{scaffolding}}"> <a href="./scaffolding.html">{{_i}}Scaffolding{{/i}}</a>
<a href="./scaffolding.html">{{_i}}Scaffolding{{/i}}</a> </li>
</li> <li class="{{base-css}}">
<li class="{{base-css}}"> <a href="./base-css.html">{{_i}}Base CSS{{/i}}</a>
<a href="./base-css.html">{{_i}}Base CSS{{/i}}</a> </li>
</li> <li class="{{components}}">
<li class="{{components}}"> <a href="./components.html">{{_i}}Components{{/i}}</a>
<a href="./components.html">{{_i}}Components{{/i}}</a> </li>
</li> <li class="{{javascript}}">
<li class="{{javascript}}"> <a href="./javascript.html">{{_i}}JavaScript{{/i}}</a>
<a href="./javascript.html">{{_i}}JavaScript{{/i}}</a> </li>
</li> <li class="{{customize}}">
<li class="{{customize}}"> <a href="./customize.html">{{_i}}Customize{{/i}}</a>
<a href="./customize.html">{{_i}}Customize{{/i}}</a> </li>
</li> </ul>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>

View File

@ -960,26 +960,22 @@
<p>{{_i}}To start, navbars are static (not fixed to the top) and include support for a project name and basic navigation. Place one anywhere within a <code>.container</code>, which sets the width of your site and content.{{/i}}</p> <p>{{_i}}To start, navbars are static (not fixed to the top) and include support for a project name and basic navigation. Place one anywhere within a <code>.container</code>, which sets the width of your site and content.{{/i}}</p>
<div class="bs-docs-example"> <div class="bs-docs-example">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <a class="brand" href="#">{{_i}}Title{{/i}}</a>
<a class="brand" href="#">{{_i}}Title{{/i}}</a> <ul class="nav">
<ul class="nav"> <li class="active"><a href="#">{{_i}}Home{{/i}}</a></li>
<li class="active"><a href="#">{{_i}}Home{{/i}}</a></li> <li><a href="#">{{_i}}Link{{/i}}</a></li>
<li><a href="#">{{_i}}Link{{/i}}</a></li> <li><a href="#">{{_i}}Link{{/i}}</a></li>
<li><a href="#">{{_i}}Link{{/i}}</a></li> </ul>
</ul>
</div>
</div> </div>
</div>{{! /example }} </div>{{! /example }}
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div class="navbar"&gt; &lt;div class="navbar"&gt;
&lt;div class="navbar-inner"&gt; &lt;a class="brand" href="#"&gt;{{_i}}Title{{/i}}&lt;/a&gt;
&lt;a class="brand" href="#"&gt;{{_i}}Title{{/i}}&lt;/a&gt; &lt;ul class="nav"&gt;
&lt;ul class="nav"&gt; &lt;li class="active"&gt;&lt;a href="#"&gt;{{_i}}Home{{/i}}&lt;/a&gt;&lt;/li&gt;
&lt;li class="active"&gt;&lt;a href="#"&gt;{{_i}}Home{{/i}}&lt;/a&gt;&lt;/li&gt; &lt;li&gt;&lt;a href="#"&gt;{{_i}}Link{{/i}}&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href="#"&gt;{{_i}}Link{{/i}}&lt;/a&gt;&lt;/li&gt; &lt;li&gt;&lt;a href="#"&gt;{{_i}}Link{{/i}}&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href="#"&gt;{{_i}}Link{{/i}}&lt;/a&gt;&lt;/li&gt; &lt;/ul&gt;
&lt;/ul&gt;
&lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
@ -993,9 +989,7 @@
<p>{{_i}}A simple link to show your brand or project name only requires an anchor tag.{{/i}}</p> <p>{{_i}}A simple link to show your brand or project name only requires an anchor tag.{{/i}}</p>
<div class="bs-docs-example"> <div class="bs-docs-example">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <a class="brand" href="#">{{_i}}Title{{/i}}</a>
<a class="brand" href="#">{{_i}}Title{{/i}}</a>
</div>
</div> </div>
</div>{{! /example }} </div>{{! /example }}
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
@ -1006,13 +1000,11 @@
<p>{{_i}}Nav items are simple to add via unordered lists.{{/i}}</p> <p>{{_i}}Nav items are simple to add via unordered lists.{{/i}}</p>
<div class="bs-docs-example"> <div class="bs-docs-example">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <ul class="nav">
<ul class="nav"> <li class="active"><a href="#">{{_i}}Home{{/i}}</a></li>
<li class="active"><a href="#">{{_i}}Home{{/i}}</a></li> <li><a href="#">{{_i}}Link{{/i}}</a></li>
<li><a href="#">{{_i}}Link{{/i}}</a></li> <li><a href="#">{{_i}}Link{{/i}}</a></li>
<li><a href="#">{{_i}}Link{{/i}}</a></li> </ul>
</ul>
</div>
</div> </div>
</div>{{! /example }} </div>{{! /example }}
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
@ -1051,12 +1043,10 @@
<p>{{_i}}To properly style and position a form within the navbar, add the appropriate classes as shown below. For a default form, include <code>.navbar-form</code> and either <code>.pull-left</code> or <code>.pull-right</code> to properly align it.{{/i}}</p> <p>{{_i}}To properly style and position a form within the navbar, add the appropriate classes as shown below. For a default form, include <code>.navbar-form</code> and either <code>.pull-left</code> or <code>.pull-right</code> to properly align it.{{/i}}</p>
<div class="bs-docs-example"> <div class="bs-docs-example">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <form class="navbar-form pull-left">
<form class="navbar-form pull-left"> <input type="text" class="span2">
<input type="text" class="span2"> <button type="submit" class="btn">{{_i}}Submit{{/i}}</button>
<button type="submit" class="btn">{{_i}}Submit{{/i}}</button> </form>
</form>
</div>
</div> </div>
</div>{{! /example }} </div>{{! /example }}
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
@ -1070,11 +1060,9 @@
<p>{{_i}}For a more customized search form, add <code>.navbar-search</code> to the <code>form</code> and <code>.search-query</code> to the input for specialized styles in the navbar.{{/i}}</p> <p>{{_i}}For a more customized search form, add <code>.navbar-search</code> to the <code>form</code> and <code>.search-query</code> to the input for specialized styles in the navbar.{{/i}}</p>
<div class="bs-docs-example"> <div class="bs-docs-example">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <form class="navbar-search pull-left">
<form class="navbar-search pull-left"> <input type="text" class="search-query" placeholder="{{_i}}Search{{/i}}">
<input type="text" class="search-query" placeholder="{{_i}}Search{{/i}}"> </form>
</form>
</div>
</div> </div>
</div>{{! /example }} </div>{{! /example }}
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
@ -1117,15 +1105,13 @@
<p>{{_i}}Add <code>.navbar-fixed-top</code> and remember to account for the hidden area underneath it by adding at least 40px <code>padding</code> to the <code>&lt;body&gt;</code>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.{{/i}}</p> <p>{{_i}}Add <code>.navbar-fixed-top</code> and remember to account for the hidden area underneath it by adding at least 40px <code>padding</code> to the <code>&lt;body&gt;</code>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.{{/i}}</p>
<div class="bs-docs-example bs-navbar-top-example"> <div class="bs-docs-example bs-navbar-top-example">
<div class="navbar navbar-fixed-top" style="position: absolute;"> <div class="navbar navbar-fixed-top" style="position: absolute;">
<div class="navbar-inner"> <div class="container" style="width: auto;">
<div class="container" style="width: auto; padding: 0 20px;"> <a class="brand" href="#">{{_i}}Title{{/i}}</a>
<a class="brand" href="#">{{_i}}Title{{/i}}</a> <ul class="nav">
<ul class="nav"> <li class="active"><a href="#">{{_i}}Home{{/i}}</a></li>
<li class="active"><a href="#">{{_i}}Home{{/i}}</a></li> <li><a href="#">{{_i}}Link{{/i}}</a></li>
<li><a href="#">{{_i}}Link{{/i}}</a></li> <li><a href="#">{{_i}}Link{{/i}}</a></li>
<li><a href="#">{{_i}}Link{{/i}}</a></li> </ul>
</ul>
</div>
</div> </div>
</div> </div>
</div>{{! /example }} </div>{{! /example }}
@ -1139,15 +1125,13 @@
<p>{{_i}}Add <code>.navbar-fixed-bottom</code> instead.{{/i}}</p> <p>{{_i}}Add <code>.navbar-fixed-bottom</code> instead.{{/i}}</p>
<div class="bs-docs-example bs-navbar-bottom-example"> <div class="bs-docs-example bs-navbar-bottom-example">
<div class="navbar navbar-fixed-bottom" style="position: absolute;"> <div class="navbar navbar-fixed-bottom" style="position: absolute;">
<div class="navbar-inner"> <div class="container" style="width: auto;">
<div class="container" style="width: auto; padding: 0 20px;"> <a class="brand" href="#">{{_i}}Title{{/i}}</a>
<a class="brand" href="#">{{_i}}Title{{/i}}</a> <ul class="nav">
<ul class="nav"> <li class="active"><a href="#">{{_i}}Home{{/i}}</a></li>
<li class="active"><a href="#">{{_i}}Home{{/i}}</a></li> <li><a href="#">{{_i}}Link{{/i}}</a></li>
<li><a href="#">{{_i}}Link{{/i}}</a></li> <li><a href="#">{{_i}}Link{{/i}}</a></li>
<li><a href="#">{{_i}}Link{{/i}}</a></li> </ul>
</ul>
</div>
</div> </div>
</div> </div>
</div>{{! /example }} </div>{{! /example }}
@ -1161,15 +1145,13 @@
<p>{{_i}}Create a full-width navbar that scrolls away with the page by adding <code>.navbar-static-top</code>. Unlike the <code>.navbar-fixed-top</code> class, you do not need to change any padding on the <code>body</code>.{{/i}}</p> <p>{{_i}}Create a full-width navbar that scrolls away with the page by adding <code>.navbar-static-top</code>. Unlike the <code>.navbar-fixed-top</code> class, you do not need to change any padding on the <code>body</code>.{{/i}}</p>
<div class="bs-docs-example bs-navbar-top-example"> <div class="bs-docs-example bs-navbar-top-example">
<div class="navbar navbar-static-top" style="margin: -1px -1px 0;"> <div class="navbar navbar-static-top" style="margin: -1px -1px 0;">
<div class="navbar-inner"> <div class="container" style="width: auto;">
<div class="container" style="width: auto; padding: 0 20px;"> <a class="brand" href="#">{{_i}}Title{{/i}}</a>
<a class="brand" href="#">{{_i}}Title{{/i}}</a> <ul class="nav">
<ul class="nav"> <li class="active"><a href="#">{{_i}}Home{{/i}}</a></li>
<li class="active"><a href="#">{{_i}}Home{{/i}}</a></li> <li><a href="#">{{_i}}Link{{/i}}</a></li>
<li><a href="#">{{_i}}Link{{/i}}</a></li> <li><a href="#">{{_i}}Link{{/i}}</a></li>
<li><a href="#">{{_i}}Link{{/i}}</a></li> </ul>
</ul>
</div>
</div> </div>
</div> </div>
</div>{{! /example }} </div>{{! /example }}
@ -1187,75 +1169,71 @@
<p>{{_i}}To implement a collapsing responsive navbar, wrap your navbar content in a containing div, <code>.nav-collapse.collapse</code>, and add the navbar toggle button, <code>.btn-navbar</code>.{{/i}}</p> <p>{{_i}}To implement a collapsing responsive navbar, wrap your navbar content in a containing div, <code>.nav-collapse.collapse</code>, and add the navbar toggle button, <code>.btn-navbar</code>.{{/i}}</p>
<div class="bs-docs-example"> <div class="bs-docs-example">
<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="#">{{_i}}Title{{/i}}</a>
<a class="brand" href="#">{{_i}}Title{{/i}}</a> <div class="nav-collapse collapse">
<div class="nav-collapse collapse"> <ul class="nav">
<ul class="nav"> <li class="active"><a href="#">{{_i}}Home{{/i}}</a></li>
<li class="active"><a href="#">{{_i}}Home{{/i}}</a></li> <li><a href="#">{{_i}}Link{{/i}}</a></li>
<li><a href="#">{{_i}}Link{{/i}}</a></li> <li><a href="#">{{_i}}Link{{/i}}</a></li>
<li><a href="#">{{_i}}Link{{/i}}</a></li> <li class="dropdown">
<li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{_i}}Dropdown{{/i}} <b class="caret"></b></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{_i}}Dropdown{{/i}} <b class="caret"></b></a> <ul class="dropdown-menu">
<ul class="dropdown-menu"> <li><a href="#">{{_i}}Action{{/i}}</a></li>
<li><a href="#">{{_i}}Action{{/i}}</a></li> <li><a href="#">{{_i}}Another action{{/i}}</a></li>
<li><a href="#">{{_i}}Another action{{/i}}</a></li> <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
<li><a href="#">{{_i}}Something else here{{/i}}</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="#">{{_i}}Separated link{{/i}}</a></li>
<li><a href="#">{{_i}}Separated link{{/i}}</a></li> <li><a href="#">{{_i}}One more separated link{{/i}}</a></li>
<li><a href="#">{{_i}}One more separated link{{/i}}</a></li> </ul>
</ul> </li>
</li> </ul>
</ul> <form class="navbar-search pull-left" action="">
<form class="navbar-search pull-left" action=""> <input type="text" class="search-query span2" placeholder="Search">
<input type="text" class="search-query span2" placeholder="Search"> </form>
</form> <ul class="nav pull-right">
<ul class="nav pull-right"> <li><a href="#">{{_i}}Link{{/i}}</a></li>
<li><a href="#">{{_i}}Link{{/i}}</a></li> <li class="divider-vertical"></li>
<li class="divider-vertical"></li> <li class="dropdown">
<li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{_i}}Dropdown{{/i}} <b class="caret"></b></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{_i}}Dropdown{{/i}} <b class="caret"></b></a> <ul class="dropdown-menu">
<ul class="dropdown-menu"> <li><a href="#">{{_i}}Action{{/i}}</a></li>
<li><a href="#">{{_i}}Action{{/i}}</a></li> <li><a href="#">{{_i}}Another action{{/i}}</a></li>
<li><a href="#">{{_i}}Another action{{/i}}</a></li> <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
<li><a href="#">{{_i}}Something else here{{/i}}</a></li> <li class="divider"></li>
<li class="divider"></li> <li><a href="#">{{_i}}Separated link{{/i}}</a></li>
<li><a href="#">{{_i}}Separated link{{/i}}</a></li> </ul>
</ul> </li>
</li> </ul>
</ul> </div><!-- /.nav-collapse -->
</div><!-- /.nav-collapse --> </div>
</div>
</div><!-- /navbar-inner -->
</div><!-- /navbar --> </div><!-- /navbar -->
</div>{{! /example }} </div>{{! /example }}
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div class="navbar"&gt; &lt;div class="navbar"&gt;
&lt;div class="navbar-inner"&gt; &lt;div class="container"&gt;
&lt;div class="container"&gt;
&lt;!-- {{_i}}.btn-navbar is used as the toggle for collapsed navbar content{{/i}} --&gt; &lt;!-- {{_i}}.btn-navbar is used as the toggle for collapsed navbar content{{/i}} --&gt;
&lt;a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"&gt; &lt;a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"&gt;
&lt;span class="icon-bar"&gt;&lt;/span&gt; &lt;span class="icon-bar"&gt;&lt;/span&gt;
&lt;span class="icon-bar"&gt;&lt;/span&gt; &lt;span class="icon-bar"&gt;&lt;/span&gt;
&lt;span class="icon-bar"&gt;&lt;/span&gt; &lt;span class="icon-bar"&gt;&lt;/span&gt;
&lt;/a&gt; &lt;/a&gt;
&lt;!-- {{_i}}Be sure to leave the brand out there if you want it shown{{/i}} --&gt; &lt;!-- {{_i}}Be sure to leave the brand out there if you want it shown{{/i}} --&gt;
&lt;a class="brand" href="#"&gt;{{_i}}Project name{{/i}}&lt;/a&gt; &lt;a class="brand" href="#"&gt;{{_i}}Project name{{/i}}&lt;/a&gt;
&lt;!-- {{_i}}Everything you want hidden at 940px or less, place within here{{/i}} --&gt;
&lt;div class="nav-collapse collapse"&gt;
&lt;!-- .nav, .navbar-search, .navbar-form, etc --&gt;
&lt;/div&gt;
&lt;!-- {{_i}}Everything you want hidden at 940px or less, place within here{{/i}} --&gt;
&lt;div class="nav-collapse collapse"&gt;
&lt;!-- .nav, .navbar-search, .navbar-form, etc --&gt;
&lt;/div&gt; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
@ -1271,52 +1249,50 @@
<p>{{_i}}Modify the look of the navbar by adding <code>.navbar-inverse</code>.{{/i}}</p> <p>{{_i}}Modify the look of the navbar by adding <code>.navbar-inverse</code>.{{/i}}</p>
<div class="bs-docs-example"> <div class="bs-docs-example">
<div class="navbar navbar-inverse" style="position: static;"> <div class="navbar navbar-inverse" style="position: static;">
<div class="navbar-inner"> <div class="container">
<div class="container"> <a class="btn btn-navbar" data-toggle="collapse" data-target=".subnav-collapse">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".subnav-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="#">{{_i}}Title{{/i}}</a>
<a class="brand" href="#">{{_i}}Title{{/i}}</a> <div class="nav-collapse collapse">
<div class="nav-collapse collapse"> <ul class="nav">
<ul class="nav"> <li class="active"><a href="#">{{_i}}Home{{/i}}</a></li>
<li class="active"><a href="#">{{_i}}Home{{/i}}</a></li> <li><a href="#">{{_i}}Link{{/i}}</a></li>
<li><a href="#">{{_i}}Link{{/i}}</a></li> <li><a href="#">{{_i}}Link{{/i}}</a></li>
<li><a href="#">{{_i}}Link{{/i}}</a></li> <li class="dropdown">
<li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{_i}}Dropdown{{/i}} <b class="caret"></b></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{_i}}Dropdown{{/i}} <b class="caret"></b></a> <ul class="dropdown-menu">
<ul class="dropdown-menu"> <li><a href="#">{{_i}}Action{{/i}}</a></li>
<li><a href="#">{{_i}}Action{{/i}}</a></li> <li><a href="#">{{_i}}Another action{{/i}}</a></li>
<li><a href="#">{{_i}}Another action{{/i}}</a></li> <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
<li><a href="#">{{_i}}Something else here{{/i}}</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="#">{{_i}}Separated link{{/i}}</a></li>
<li><a href="#">{{_i}}Separated link{{/i}}</a></li> <li><a href="#">{{_i}}One more separated link{{/i}}</a></li>
<li><a href="#">{{_i}}One more separated link{{/i}}</a></li> </ul>
</ul> </li>
</li> </ul>
</ul> <form class="navbar-search pull-left" action="">
<form class="navbar-search pull-left" action=""> <input type="text" class="search-query span2" placeholder="Search">
<input type="text" class="search-query span2" placeholder="Search"> </form>
</form> <ul class="nav pull-right">
<ul class="nav pull-right"> <li><a href="#">{{_i}}Link{{/i}}</a></li>
<li><a href="#">{{_i}}Link{{/i}}</a></li> <li class="divider-vertical"></li>
<li class="divider-vertical"></li> <li class="dropdown">
<li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{_i}}Dropdown{{/i}} <b class="caret"></b></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{_i}}Dropdown{{/i}} <b class="caret"></b></a> <ul class="dropdown-menu">
<ul class="dropdown-menu"> <li><a href="#">{{_i}}Action{{/i}}</a></li>
<li><a href="#">{{_i}}Action{{/i}}</a></li> <li><a href="#">{{_i}}Another action{{/i}}</a></li>
<li><a href="#">{{_i}}Another action{{/i}}</a></li> <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
<li><a href="#">{{_i}}Something else here{{/i}}</a></li> <li class="divider"></li>
<li class="divider"></li> <li><a href="#">{{_i}}Separated link{{/i}}</a></li>
<li><a href="#">{{_i}}Separated link{{/i}}</a></li> </ul>
</ul> </li>
</li> </ul>
</ul> </div><!-- /.nav-collapse -->
</div><!-- /.nav-collapse --> </div>
</div>
</div><!-- /navbar-inner -->
</div><!-- /navbar --> </div><!-- /navbar -->
</div>{{! /example }} </div>{{! /example }}
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">

View File

@ -9,17 +9,10 @@
// Base class and wrapper // Base class and wrapper
.navbar { .navbar {
overflow: visible; overflow: visible;
padding: 0 20px;
margin-bottom: @baseLineHeight; margin-bottom: @baseLineHeight;
color: @navbarText; color: @navbarText;
} background-color: @navbarBackground;
// Inner for background effects
// Gradient is applied to its own element because overflow visible is not honored by IE when filter is present
.navbar-inner {
min-height: @navbarHeight;
padding-left: 20px;
padding-right: 20px;
#gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
border: 1px solid @navbarBorder; border: 1px solid @navbarBorder;
.border-radius(4px); .border-radius(4px);
.box-shadow(0 1px 4px rgba(0,0,0,.065)); .box-shadow(0 1px 4px rgba(0,0,0,.065));
@ -150,9 +143,7 @@
.navbar-static-top { .navbar-static-top {
position: static; position: static;
margin-bottom: 0; // remove 18px margin for default navbar margin-bottom: 0; // remove 18px margin for default navbar
.navbar-inner { .border-radius(0);
.border-radius(0);
}
} }
@ -168,20 +159,14 @@
left: 0; left: 0;
z-index: @zindexFixedNavbar; z-index: @zindexFixedNavbar;
margin-bottom: 0; // remove 18px margin for default navbar margin-bottom: 0; // remove 18px margin for default navbar
}
.navbar-fixed-top .navbar-inner,
.navbar-static-top .navbar-inner {
border-width: 0 0 1px; border-width: 0 0 1px;
}
.navbar-fixed-bottom .navbar-inner {
border-width: 1px 0 0;
}
.navbar-fixed-top .navbar-inner,
.navbar-fixed-bottom .navbar-inner {
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
.border-radius(0); .border-radius(0);
} }
.navbar-fixed-bottom {
border-width: 1px 0 0;
}
// Reset container width // Reset container width
// Required here as we reset the width earlier on and the grid mixins don't override early enough // Required here as we reset the width earlier on and the grid mixins don't override early enough
@ -197,17 +182,13 @@
} }
.navbar-fixed-top, .navbar-fixed-top,
.navbar-static-top { .navbar-static-top {
.navbar-inner { .box-shadow(~"inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1)");
.box-shadow(~"inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1)");
}
} }
// Fixed to bottom // Fixed to bottom
.navbar-fixed-bottom { .navbar-fixed-bottom {
bottom: 0; bottom: 0;
.navbar-inner { .box-shadow(~"inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1)");
.box-shadow(~"inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1)");
}
} }
@ -376,11 +357,8 @@
.navbar-inverse { .navbar-inverse {
color: @navbarInverseText; color: @navbarInverseText;
background-color: @navbarInverseBackground;
.navbar-inner { border-color: @navbarInverseBorder;
#gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground);
border-color: @navbarInverseBorder;
}
.brand, .brand,
.nav > li > a { .nav > li > a {

View File

@ -24,8 +24,8 @@
.navbar-fixed-bottom { .navbar-fixed-bottom {
margin-top: @baseLineHeight; margin-top: @baseLineHeight;
} }
.navbar-fixed-top .navbar-inner, .navbar-fixed-top,
.navbar-fixed-bottom .navbar-inner { .navbar-fixed-bottom {
padding: 5px; padding: 5px;
} }
.navbar .container { .navbar .container {
@ -154,7 +154,7 @@
// STATIC NAVBAR // STATIC NAVBAR
// ------------- // -------------
.navbar-static .navbar-inner { .navbar-static {
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
} }