diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index f456bc2137a2605fcfe570f2273d7b45bec2bbf1..671cdd3c7c589f2ea4bc10f34ea98851b9244a88 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -590,8 +590,8 @@
.navbar-fixed-bottom {
margin-top: 20px;
}
- .navbar-fixed-top .navbar-inner,
- .navbar-fixed-bottom .navbar-inner {
+ .navbar-fixed-top,
+ .navbar-fixed-bottom {
padding: 5px;
}
.navbar .container {
@@ -711,7 +711,7 @@
.navbar .btn-navbar {
display: block;
}
- .navbar-static .navbar-inner {
+ .navbar-static {
padding-right: 10px;
padding-left: 10px;
}
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 057753c3bba6d5ea702e9854f2c3e776e08aa12d..4e7d61c2f6f6b3a4f3965af70592daa08c5c8c09 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4046,40 +4046,28 @@ input[type="submit"].btn::-moz-focus-inner {
}
.navbar {
+ padding: 0 20px;
margin-bottom: 20px;
overflow: visible;
color: #777777;
-}
-
-.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;
+ background-color: #f2f2f2;
border: 1px solid #d4d4d4;
-webkit-border-radius: 4px;
-moz-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);
-moz-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-inner:after {
+.navbar:before,
+.navbar:after {
display: table;
line-height: 0;
content: "";
}
-.navbar-inner:after {
+.navbar:after {
clear: both;
}
@@ -4206,9 +4194,6 @@ input[type="submit"].btn::-moz-focus-inner {
.navbar-static-top {
position: static;
margin-bottom: 0;
-}
-
-.navbar-static-top .navbar-inner {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
@@ -4220,27 +4205,19 @@ input[type="submit"].btn::-moz-focus-inner {
right: 0;
left: 0;
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-left: 0;
+ margin-bottom: 0;
+ border-width: 0 0 1px;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
+.navbar-fixed-bottom {
+ border-width: 1px 0 0;
+}
+
.navbar-static-top .container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container {
@@ -4251,8 +4228,8 @@ input[type="submit"].btn::-moz-focus-inner {
top: 0;
}
-.navbar-fixed-top .navbar-inner,
-.navbar-static-top .navbar-inner {
+.navbar-fixed-top,
+.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);
-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);
@@ -4260,9 +4237,6 @@ input[type="submit"].btn::-moz-focus-inner {
.navbar-fixed-bottom {
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);
-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);
@@ -4459,18 +4433,8 @@ input[type="submit"].btn::-moz-focus-inner {
.navbar-inverse {
color: #999999;
-}
-
-.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;
+ background-color: #111111;
border-color: #252525;
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
}
.navbar-inverse .brand,
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 3226994523658d931b03d6ce39d0aeee10eac27e..4abea08c7adb1b6405e0efc38ea74ebd1ac3c26a 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -28,6 +28,7 @@ h3 code {
body > .navbar {
font-size: 13px;
+ background-color: rgba(0,0,0,.9);
}
/* Change the docs' brand */
diff --git a/docs/base-css.html b/docs/base-css.html
index 4a4b46b478f85e13caf8c7f7340647d33178e33f..1cf70023630056a31e6a44a9a21da7b43d3a5261 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -32,39 +32,37 @@
<!-- Navbar
================================================== -->
<div class="navbar navbar-inverse navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container">
- <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>
- </button>
- <a class="brand" href="./index.html">Bootstrap</a>
- <div class="nav-collapse collapse">
- <ul class="nav">
- <li class="">
- <a href="./index.html">Home</a>
- </li>
- <li class="">
- <a href="./getting-started.html">Get started</a>
- </li>
- <li class="">
- <a href="./scaffolding.html">Scaffolding</a>
- </li>
- <li class="active">
- <a href="./base-css.html">Base CSS</a>
- </li>
- <li class="">
- <a href="./components.html">Components</a>
- </li>
- <li class="">
- <a href="./javascript.html">JavaScript</a>
- </li>
- <li class="">
- <a href="./customize.html">Customize</a>
- </li>
- </ul>
- </div>
+ <div class="container">
+ <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>
+ </button>
+ <a class="brand" href="./index.html">Bootstrap</a>
+ <div class="nav-collapse collapse">
+ <ul class="nav">
+ <li class="">
+ <a href="./index.html">Home</a>
+ </li>
+ <li class="">
+ <a href="./getting-started.html">Get started</a>
+ </li>
+ <li class="">
+ <a href="./scaffolding.html">Scaffolding</a>
+ </li>
+ <li class="active">
+ <a href="./base-css.html">Base CSS</a>
+ </li>
+ <li class="">
+ <a href="./components.html">Components</a>
+ </li>
+ <li class="">
+ <a href="./javascript.html">JavaScript</a>
+ </li>
+ <li class="">
+ <a href="./customize.html">Customize</a>
+ </li>
+ </ul>
</div>
</div>
</div>
diff --git a/docs/components.html b/docs/components.html
index 6422c1611d9a2ac1ed71bd55b52e4573ee24bc54..53c416d55ecdf2b7db70c3e55a87b2da808dd09d 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -32,39 +32,37 @@
<!-- Navbar
================================================== -->
<div class="navbar navbar-inverse navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container">
- <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>
- </button>
- <a class="brand" href="./index.html">Bootstrap</a>
- <div class="nav-collapse collapse">
- <ul class="nav">
- <li class="">
- <a href="./index.html">Home</a>
- </li>
- <li class="">
- <a href="./getting-started.html">Get started</a>
- </li>
- <li class="">
- <a href="./scaffolding.html">Scaffolding</a>
- </li>
- <li class="">
- <a href="./base-css.html">Base CSS</a>
- </li>
- <li class="active">
- <a href="./components.html">Components</a>
- </li>
- <li class="">
- <a href="./javascript.html">JavaScript</a>
- </li>
- <li class="">
- <a href="./customize.html">Customize</a>
- </li>
- </ul>
- </div>
+ <div class="container">
+ <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>
+ </button>
+ <a class="brand" href="./index.html">Bootstrap</a>
+ <div class="nav-collapse collapse">
+ <ul class="nav">
+ <li class="">
+ <a href="./index.html">Home</a>
+ </li>
+ <li class="">
+ <a href="./getting-started.html">Get started</a>
+ </li>
+ <li class="">
+ <a href="./scaffolding.html">Scaffolding</a>
+ </li>
+ <li class="">
+ <a href="./base-css.html">Base CSS</a>
+ </li>
+ <li class="active">
+ <a href="./components.html">Components</a>
+ </li>
+ <li class="">
+ <a href="./javascript.html">JavaScript</a>
+ </li>
+ <li class="">
+ <a href="./customize.html">Customize</a>
+ </li>
+ </ul>
</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>
<div class="bs-docs-example">
<div class="navbar">
- <div class="navbar-inner">
- <a class="brand" href="#">Title</a>
- <ul class="nav">
- <li class="active"><a href="#">Home</a></li>
- <li><a href="#">Link</a></li>
- <li><a href="#">Link</a></li>
- </ul>
- </div>
+ <a class="brand" href="#">Title</a>
+ <ul class="nav">
+ <li class="active"><a href="#">Home</a></li>
+ <li><a href="#">Link</a></li>
+ <li><a href="#">Link</a></li>
+ </ul>
</div>
</div>
<pre class="prettyprint linenums">
<div class="navbar">
- <div class="navbar-inner">
- <a class="brand" href="#">Title</a>
- <ul class="nav">
- <li class="active"><a href="#">Home</a></li>
- <li><a href="#">Link</a></li>
- <li><a href="#">Link</a></li>
- </ul>
- </div>
+ <a class="brand" href="#">Title</a>
+ <ul class="nav">
+ <li class="active"><a href="#">Home</a></li>
+ <li><a href="#">Link</a></li>
+ <li><a href="#">Link</a></li>
+ </ul>
</div>
</pre>
@@ -1064,9 +1058,7 @@
<p>A simple link to show your brand or project name only requires an anchor tag.</p>
<div class="bs-docs-example">
<div class="navbar">
- <div class="navbar-inner">
- <a class="brand" href="#">Title</a>
- </div>
+ <a class="brand" href="#">Title</a>
</div>
</div>
<pre class="prettyprint linenums">
@@ -1077,13 +1069,11 @@
<p>Nav items are simple to add via unordered lists.</p>
<div class="bs-docs-example">
<div class="navbar">
- <div class="navbar-inner">
- <ul class="nav">
- <li class="active"><a href="#">Home</a></li>
- <li><a href="#">Link</a></li>
- <li><a href="#">Link</a></li>
- </ul>
- </div>
+ <ul class="nav">
+ <li class="active"><a href="#">Home</a></li>
+ <li><a href="#">Link</a></li>
+ <li><a href="#">Link</a></li>
+ </ul>
</div>
</div>
<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>
<div class="bs-docs-example">
<div class="navbar">
- <div class="navbar-inner">
- <form class="navbar-form pull-left">
- <input type="text" class="span2">
- <button type="submit" class="btn">Submit</button>
- </form>
- </div>
+ <form class="navbar-form pull-left">
+ <input type="text" class="span2">
+ <button type="submit" class="btn">Submit</button>
+ </form>
</div>
</div>
<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>
<div class="bs-docs-example">
<div class="navbar">
- <div class="navbar-inner">
- <form class="navbar-search pull-left">
- <input type="text" class="search-query" placeholder="Search">
- </form>
- </div>
+ <form class="navbar-search pull-left">
+ <input type="text" class="search-query" placeholder="Search">
+ </form>
</div>
</div>
<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><body></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="navbar navbar-fixed-top" style="position: absolute;">
- <div class="navbar-inner">
- <div class="container" style="width: auto; padding: 0 20px;">
- <a class="brand" href="#">Title</a>
- <ul class="nav">
- <li class="active"><a href="#">Home</a></li>
- <li><a href="#">Link</a></li>
- <li><a href="#">Link</a></li>
- </ul>
- </div>
+ <div class="container" style="width: auto;">
+ <a class="brand" href="#">Title</a>
+ <ul class="nav">
+ <li class="active"><a href="#">Home</a></li>
+ <li><a href="#">Link</a></li>
+ <li><a href="#">Link</a></li>
+ </ul>
</div>
</div>
</div>
@@ -1210,15 +1194,13 @@
<p>Add <code>.navbar-fixed-bottom</code> instead.</p>
<div class="bs-docs-example bs-navbar-bottom-example">
<div class="navbar navbar-fixed-bottom" style="position: absolute;">
- <div class="navbar-inner">
- <div class="container" style="width: auto; padding: 0 20px;">
- <a class="brand" href="#">Title</a>
- <ul class="nav">
- <li class="active"><a href="#">Home</a></li>
- <li><a href="#">Link</a></li>
- <li><a href="#">Link</a></li>
- </ul>
- </div>
+ <div class="container" style="width: auto;">
+ <a class="brand" href="#">Title</a>
+ <ul class="nav">
+ <li class="active"><a href="#">Home</a></li>
+ <li><a href="#">Link</a></li>
+ <li><a href="#">Link</a></li>
+ </ul>
</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>
<div class="bs-docs-example bs-navbar-top-example">
<div class="navbar navbar-static-top" style="margin: -1px -1px 0;">
- <div class="navbar-inner">
- <div class="container" style="width: auto; padding: 0 20px;">
- <a class="brand" href="#">Title</a>
- <ul class="nav">
- <li class="active"><a href="#">Home</a></li>
- <li><a href="#">Link</a></li>
- <li><a href="#">Link</a></li>
- </ul>
- </div>
+ <div class="container" style="width: auto;">
+ <a class="brand" href="#">Title</a>
+ <ul class="nav">
+ <li class="active"><a href="#">Home</a></li>
+ <li><a href="#">Link</a></li>
+ <li><a href="#">Link</a></li>
+ </ul>
</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>
<div class="bs-docs-example">
<div class="navbar">
- <div class="navbar-inner">
- <div class="container">
- <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>
- </a>
- <a class="brand" href="#">Title</a>
- <div class="nav-collapse collapse">
- <ul class="nav">
- <li class="active"><a href="#">Home</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="nav-header">Nav header</li>
- <li><a href="#">Separated link</a></li>
- <li><a href="#">One more separated link</a></li>
- </ul>
- </li>
- </ul>
- <form class="navbar-search pull-left" action="">
- <input type="text" class="search-query span2" placeholder="Search">
- </form>
- <ul class="nav pull-right">
- <li><a href="#">Link</a></li>
- <li class="divider-vertical"></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><a href="#">Separated link</a></li>
- </ul>
- </li>
- </ul>
- </div><!-- /.nav-collapse -->
- </div>
- </div><!-- /navbar-inner -->
+ <div class="container">
+ <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>
+ </a>
+ <a class="brand" href="#">Title</a>
+ <div class="nav-collapse collapse">
+ <ul class="nav">
+ <li class="active"><a href="#">Home</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="nav-header">Nav header</li>
+ <li><a href="#">Separated link</a></li>
+ <li><a href="#">One more separated link</a></li>
+ </ul>
+ </li>
+ </ul>
+ <form class="navbar-search pull-left" action="">
+ <input type="text" class="search-query span2" placeholder="Search">
+ </form>
+ <ul class="nav pull-right">
+ <li><a href="#">Link</a></li>
+ <li class="divider-vertical"></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><a href="#">Separated link</a></li>
+ </ul>
+ </li>
+ </ul>
+ </div><!-- /.nav-collapse -->
+ </div>
</div><!-- /navbar -->
</div>
<pre class="prettyprint linenums">
<div class="navbar">
- <div class="navbar-inner">
- <div class="container">
-
- <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
- <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>
- </a>
+ <div class="container">
- <!-- Be sure to leave the brand out there if you want it shown -->
- <a class="brand" href="#">Project name</a>
+ <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
+ <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>
+ </a>
- <!-- Everything you want hidden at 940px or less, place within here -->
- <div class="nav-collapse collapse">
- <!-- .nav, .navbar-search, .navbar-form, etc -->
- </div>
+ <!-- Be sure to leave the brand out there if you want it shown -->
+ <a class="brand" href="#">Project name</a>
+ <!-- Everything you want hidden at 940px or less, place within here -->
+ <div class="nav-collapse collapse">
+ <!-- .nav, .navbar-search, .navbar-form, etc -->
</div>
+
</div>
</div>
</pre>
@@ -1342,52 +1318,50 @@
<p>Modify the look of the navbar by adding <code>.navbar-inverse</code>.</p>
<div class="bs-docs-example">
<div class="navbar navbar-inverse" style="position: static;">
- <div class="navbar-inner">
- <div class="container">
- <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>
- </a>
- <a class="brand" href="#">Title</a>
- <div class="nav-collapse collapse">
- <ul class="nav">
- <li class="active"><a href="#">Home</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="nav-header">Nav header</li>
- <li><a href="#">Separated link</a></li>
- <li><a href="#">One more separated link</a></li>
- </ul>
- </li>
- </ul>
- <form class="navbar-search pull-left" action="">
- <input type="text" class="search-query span2" placeholder="Search">
- </form>
- <ul class="nav pull-right">
- <li><a href="#">Link</a></li>
- <li class="divider-vertical"></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><a href="#">Separated link</a></li>
- </ul>
- </li>
- </ul>
- </div><!-- /.nav-collapse -->
- </div>
- </div><!-- /navbar-inner -->
+ <div class="container">
+ <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>
+ </a>
+ <a class="brand" href="#">Title</a>
+ <div class="nav-collapse collapse">
+ <ul class="nav">
+ <li class="active"><a href="#">Home</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="nav-header">Nav header</li>
+ <li><a href="#">Separated link</a></li>
+ <li><a href="#">One more separated link</a></li>
+ </ul>
+ </li>
+ </ul>
+ <form class="navbar-search pull-left" action="">
+ <input type="text" class="search-query span2" placeholder="Search">
+ </form>
+ <ul class="nav pull-right">
+ <li><a href="#">Link</a></li>
+ <li class="divider-vertical"></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><a href="#">Separated link</a></li>
+ </ul>
+ </li>
+ </ul>
+ </div><!-- /.nav-collapse -->
+ </div>
</div><!-- /navbar -->
</div>
<pre class="prettyprint linenums">
diff --git a/docs/customize.html b/docs/customize.html
index 4673189fce5350e3fb37b757b6b86420a214d7e6..964ac1da3141a0fd826ffdbd98c420be7a0899e2 100644
--- a/docs/customize.html
+++ b/docs/customize.html
@@ -32,39 +32,37 @@
<!-- Navbar
================================================== -->
<div class="navbar navbar-inverse navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container">
- <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>
- </button>
- <a class="brand" href="./index.html">Bootstrap</a>
- <div class="nav-collapse collapse">
- <ul class="nav">
- <li class="">
- <a href="./index.html">Home</a>
- </li>
- <li class="">
- <a href="./getting-started.html">Get started</a>
- </li>
- <li class="">
- <a href="./scaffolding.html">Scaffolding</a>
- </li>
- <li class="">
- <a href="./base-css.html">Base CSS</a>
- </li>
- <li class="">
- <a href="./components.html">Components</a>
- </li>
- <li class="">
- <a href="./javascript.html">JavaScript</a>
- </li>
- <li class="active">
- <a href="./customize.html">Customize</a>
- </li>
- </ul>
- </div>
+ <div class="container">
+ <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>
+ </button>
+ <a class="brand" href="./index.html">Bootstrap</a>
+ <div class="nav-collapse collapse">
+ <ul class="nav">
+ <li class="">
+ <a href="./index.html">Home</a>
+ </li>
+ <li class="">
+ <a href="./getting-started.html">Get started</a>
+ </li>
+ <li class="">
+ <a href="./scaffolding.html">Scaffolding</a>
+ </li>
+ <li class="">
+ <a href="./base-css.html">Base CSS</a>
+ </li>
+ <li class="">
+ <a href="./components.html">Components</a>
+ </li>
+ <li class="">
+ <a href="./javascript.html">JavaScript</a>
+ </li>
+ <li class="active">
+ <a href="./customize.html">Customize</a>
+ </li>
+ </ul>
</div>
</div>
</div>
diff --git a/docs/extend.html b/docs/extend.html
index 4c55a7220e2655bfdaa1455fe059a56d2ee19358..58d14701aefeeebddba2b59b9d06e4f5bf7e0617 100644
--- a/docs/extend.html
+++ b/docs/extend.html
@@ -32,39 +32,37 @@
<!-- Navbar
================================================== -->
<div class="navbar navbar-inverse navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container">
- <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>
- </button>
- <a class="brand" href="./index.html">Bootstrap</a>
- <div class="nav-collapse collapse">
- <ul class="nav">
- <li class="">
- <a href="./index.html">Home</a>
- </li>
- <li class="">
- <a href="./getting-started.html">Get started</a>
- </li>
- <li class="">
- <a href="./scaffolding.html">Scaffolding</a>
- </li>
- <li class="">
- <a href="./base-css.html">Base CSS</a>
- </li>
- <li class="">
- <a href="./components.html">Components</a>
- </li>
- <li class="">
- <a href="./javascript.html">JavaScript</a>
- </li>
- <li class="">
- <a href="./customize.html">Customize</a>
- </li>
- </ul>
- </div>
+ <div class="container">
+ <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>
+ </button>
+ <a class="brand" href="./index.html">Bootstrap</a>
+ <div class="nav-collapse collapse">
+ <ul class="nav">
+ <li class="">
+ <a href="./index.html">Home</a>
+ </li>
+ <li class="">
+ <a href="./getting-started.html">Get started</a>
+ </li>
+ <li class="">
+ <a href="./scaffolding.html">Scaffolding</a>
+ </li>
+ <li class="">
+ <a href="./base-css.html">Base CSS</a>
+ </li>
+ <li class="">
+ <a href="./components.html">Components</a>
+ </li>
+ <li class="">
+ <a href="./javascript.html">JavaScript</a>
+ </li>
+ <li class="">
+ <a href="./customize.html">Customize</a>
+ </li>
+ </ul>
</div>
</div>
</div>
diff --git a/docs/getting-started.html b/docs/getting-started.html
index b81c79ed6531e17335ccc70094391aa61530ea4b..6abb56f0827d51ceab2eff5ff5428459464c62e5 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -32,39 +32,37 @@
<!-- Navbar
================================================== -->
<div class="navbar navbar-inverse navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container">
- <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>
- </button>
- <a class="brand" href="./index.html">Bootstrap</a>
- <div class="nav-collapse collapse">
- <ul class="nav">
- <li class="">
- <a href="./index.html">Home</a>
- </li>
- <li class="active">
- <a href="./getting-started.html">Get started</a>
- </li>
- <li class="">
- <a href="./scaffolding.html">Scaffolding</a>
- </li>
- <li class="">
- <a href="./base-css.html">Base CSS</a>
- </li>
- <li class="">
- <a href="./components.html">Components</a>
- </li>
- <li class="">
- <a href="./javascript.html">JavaScript</a>
- </li>
- <li class="">
- <a href="./customize.html">Customize</a>
- </li>
- </ul>
- </div>
+ <div class="container">
+ <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>
+ </button>
+ <a class="brand" href="./index.html">Bootstrap</a>
+ <div class="nav-collapse collapse">
+ <ul class="nav">
+ <li class="">
+ <a href="./index.html">Home</a>
+ </li>
+ <li class="active">
+ <a href="./getting-started.html">Get started</a>
+ </li>
+ <li class="">
+ <a href="./scaffolding.html">Scaffolding</a>
+ </li>
+ <li class="">
+ <a href="./base-css.html">Base CSS</a>
+ </li>
+ <li class="">
+ <a href="./components.html">Components</a>
+ </li>
+ <li class="">
+ <a href="./javascript.html">JavaScript</a>
+ </li>
+ <li class="">
+ <a href="./customize.html">Customize</a>
+ </li>
+ </ul>
</div>
</div>
</div>
diff --git a/docs/index.html b/docs/index.html
index 9d0beba7eafd7a7c8ab3d795c7af3e095c404080..f9961372f9b16da67118af59396364344fcd2113 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -32,39 +32,37 @@
<!-- Navbar
================================================== -->
<div class="navbar navbar-inverse navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container">
- <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>
- </button>
- <a class="brand" href="./index.html">Bootstrap</a>
- <div class="nav-collapse collapse">
- <ul class="nav">
- <li class="active">
- <a href="./index.html">Home</a>
- </li>
- <li class="">
- <a href="./getting-started.html">Get started</a>
- </li>
- <li class="">
- <a href="./scaffolding.html">Scaffolding</a>
- </li>
- <li class="">
- <a href="./base-css.html">Base CSS</a>
- </li>
- <li class="">
- <a href="./components.html">Components</a>
- </li>
- <li class="">
- <a href="./javascript.html">JavaScript</a>
- </li>
- <li class="">
- <a href="./customize.html">Customize</a>
- </li>
- </ul>
- </div>
+ <div class="container">
+ <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>
+ </button>
+ <a class="brand" href="./index.html">Bootstrap</a>
+ <div class="nav-collapse collapse">
+ <ul class="nav">
+ <li class="active">
+ <a href="./index.html">Home</a>
+ </li>
+ <li class="">
+ <a href="./getting-started.html">Get started</a>
+ </li>
+ <li class="">
+ <a href="./scaffolding.html">Scaffolding</a>
+ </li>
+ <li class="">
+ <a href="./base-css.html">Base CSS</a>
+ </li>
+ <li class="">
+ <a href="./components.html">Components</a>
+ </li>
+ <li class="">
+ <a href="./javascript.html">JavaScript</a>
+ </li>
+ <li class="">
+ <a href="./customize.html">Customize</a>
+ </li>
+ </ul>
</div>
</div>
</div>
diff --git a/docs/javascript.html b/docs/javascript.html
index 6c028e01e5ca077462397cba885dd36253ba5026..0dcd2053dbfece4c6429ee3b34f23abc6fefb4ea 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -32,39 +32,37 @@
<!-- Navbar
================================================== -->
<div class="navbar navbar-inverse navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container">
- <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>
- </button>
- <a class="brand" href="./index.html">Bootstrap</a>
- <div class="nav-collapse collapse">
- <ul class="nav">
- <li class="">
- <a href="./index.html">Home</a>
- </li>
- <li class="">
- <a href="./getting-started.html">Get started</a>
- </li>
- <li class="">
- <a href="./scaffolding.html">Scaffolding</a>
- </li>
- <li class="">
- <a href="./base-css.html">Base CSS</a>
- </li>
- <li class="">
- <a href="./components.html">Components</a>
- </li>
- <li class="active">
- <a href="./javascript.html">JavaScript</a>
- </li>
- <li class="">
- <a href="./customize.html">Customize</a>
- </li>
- </ul>
- </div>
+ <div class="container">
+ <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>
+ </button>
+ <a class="brand" href="./index.html">Bootstrap</a>
+ <div class="nav-collapse collapse">
+ <ul class="nav">
+ <li class="">
+ <a href="./index.html">Home</a>
+ </li>
+ <li class="">
+ <a href="./getting-started.html">Get started</a>
+ </li>
+ <li class="">
+ <a href="./scaffolding.html">Scaffolding</a>
+ </li>
+ <li class="">
+ <a href="./base-css.html">Base CSS</a>
+ </li>
+ <li class="">
+ <a href="./components.html">Components</a>
+ </li>
+ <li class="active">
+ <a href="./javascript.html">JavaScript</a>
+ </li>
+ <li class="">
+ <a href="./customize.html">Customize</a>
+ </li>
+ </ul>
</div>
</div>
</div>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 4a84e353fc86dc479dd89e887d3bf582292a57fd..6e6c0b992455e9d65f5ee7716887548200347fb1 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -32,39 +32,37 @@
<!-- Navbar
================================================== -->
<div class="navbar navbar-inverse navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container">
- <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>
- </button>
- <a class="brand" href="./index.html">Bootstrap</a>
- <div class="nav-collapse collapse">
- <ul class="nav">
- <li class="">
- <a href="./index.html">Home</a>
- </li>
- <li class="">
- <a href="./getting-started.html">Get started</a>
- </li>
- <li class="active">
- <a href="./scaffolding.html">Scaffolding</a>
- </li>
- <li class="">
- <a href="./base-css.html">Base CSS</a>
- </li>
- <li class="">
- <a href="./components.html">Components</a>
- </li>
- <li class="">
- <a href="./javascript.html">JavaScript</a>
- </li>
- <li class="">
- <a href="./customize.html">Customize</a>
- </li>
- </ul>
- </div>
+ <div class="container">
+ <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>
+ </button>
+ <a class="brand" href="./index.html">Bootstrap</a>
+ <div class="nav-collapse collapse">
+ <ul class="nav">
+ <li class="">
+ <a href="./index.html">Home</a>
+ </li>
+ <li class="">
+ <a href="./getting-started.html">Get started</a>
+ </li>
+ <li class="active">
+ <a href="./scaffolding.html">Scaffolding</a>
+ </li>
+ <li class="">
+ <a href="./base-css.html">Base CSS</a>
+ </li>
+ <li class="">
+ <a href="./components.html">Components</a>
+ </li>
+ <li class="">
+ <a href="./javascript.html">JavaScript</a>
+ </li>
+ <li class="">
+ <a href="./customize.html">Customize</a>
+ </li>
+ </ul>
</div>
</div>
</div>
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 2f0e1e85665e5efc2c51dbb2cf17ed75706a46a6..db769d65b194c459a8f4e7e80e66b25bd4c17e19 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -44,39 +44,37 @@
<!-- Navbar
================================================== -->
<div class="navbar navbar-inverse navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container">
- <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>
- </button>
- <a class="brand" href="./index.html">Bootstrap</a>
- <div class="nav-collapse collapse">
- <ul class="nav">
- <li class="{{index}}">
- <a href="./index.html">{{_i}}Home{{/i}}</a>
- </li>
- <li class="{{getting-started}}">
- <a href="./getting-started.html">{{_i}}Get started{{/i}}</a>
- </li>
- <li class="{{scaffolding}}">
- <a href="./scaffolding.html">{{_i}}Scaffolding{{/i}}</a>
- </li>
- <li class="{{base-css}}">
- <a href="./base-css.html">{{_i}}Base CSS{{/i}}</a>
- </li>
- <li class="{{components}}">
- <a href="./components.html">{{_i}}Components{{/i}}</a>
- </li>
- <li class="{{javascript}}">
- <a href="./javascript.html">{{_i}}JavaScript{{/i}}</a>
- </li>
- <li class="{{customize}}">
- <a href="./customize.html">{{_i}}Customize{{/i}}</a>
- </li>
- </ul>
- </div>
+ <div class="container">
+ <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>
+ </button>
+ <a class="brand" href="./index.html">Bootstrap</a>
+ <div class="nav-collapse collapse">
+ <ul class="nav">
+ <li class="{{index}}">
+ <a href="./index.html">{{_i}}Home{{/i}}</a>
+ </li>
+ <li class="{{getting-started}}">
+ <a href="./getting-started.html">{{_i}}Get started{{/i}}</a>
+ </li>
+ <li class="{{scaffolding}}">
+ <a href="./scaffolding.html">{{_i}}Scaffolding{{/i}}</a>
+ </li>
+ <li class="{{base-css}}">
+ <a href="./base-css.html">{{_i}}Base CSS{{/i}}</a>
+ </li>
+ <li class="{{components}}">
+ <a href="./components.html">{{_i}}Components{{/i}}</a>
+ </li>
+ <li class="{{javascript}}">
+ <a href="./javascript.html">{{_i}}JavaScript{{/i}}</a>
+ </li>
+ <li class="{{customize}}">
+ <a href="./customize.html">{{_i}}Customize{{/i}}</a>
+ </li>
+ </ul>
</div>
</div>
</div>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 15f60f5c12cd9189c0c886187ebd7ee922d3755a..7389f7985fb71f7e2007070f7bf54b6895cbb099 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -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>
<div class="bs-docs-example">
<div class="navbar">
- <div class="navbar-inner">
- <a class="brand" href="#">{{_i}}Title{{/i}}</a>
- <ul class="nav">
- <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>
- </ul>
- </div>
+ <a class="brand" href="#">{{_i}}Title{{/i}}</a>
+ <ul class="nav">
+ <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>
+ </ul>
</div>
</div>{{! /example }}
<pre class="prettyprint linenums">
<div class="navbar">
- <div class="navbar-inner">
- <a class="brand" href="#">{{_i}}Title{{/i}}</a>
- <ul class="nav">
- <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>
- </ul>
- </div>
+ <a class="brand" href="#">{{_i}}Title{{/i}}</a>
+ <ul class="nav">
+ <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>
+ </ul>
</div>
</pre>
@@ -993,9 +989,7 @@
<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="navbar">
- <div class="navbar-inner">
- <a class="brand" href="#">{{_i}}Title{{/i}}</a>
- </div>
+ <a class="brand" href="#">{{_i}}Title{{/i}}</a>
</div>
</div>{{! /example }}
<pre class="prettyprint linenums">
@@ -1006,13 +1000,11 @@
<p>{{_i}}Nav items are simple to add via unordered lists.{{/i}}</p>
<div class="bs-docs-example">
<div class="navbar">
- <div class="navbar-inner">
- <ul class="nav">
- <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>
- </ul>
- </div>
+ <ul class="nav">
+ <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>
+ </ul>
</div>
</div>{{! /example }}
<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>
<div class="bs-docs-example">
<div class="navbar">
- <div class="navbar-inner">
- <form class="navbar-form pull-left">
- <input type="text" class="span2">
- <button type="submit" class="btn">{{_i}}Submit{{/i}}</button>
- </form>
- </div>
+ <form class="navbar-form pull-left">
+ <input type="text" class="span2">
+ <button type="submit" class="btn">{{_i}}Submit{{/i}}</button>
+ </form>
</div>
</div>{{! /example }}
<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>
<div class="bs-docs-example">
<div class="navbar">
- <div class="navbar-inner">
- <form class="navbar-search pull-left">
- <input type="text" class="search-query" placeholder="{{_i}}Search{{/i}}">
- </form>
- </div>
+ <form class="navbar-search pull-left">
+ <input type="text" class="search-query" placeholder="{{_i}}Search{{/i}}">
+ </form>
</div>
</div>{{! /example }}
<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><body></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="navbar navbar-fixed-top" style="position: absolute;">
- <div class="navbar-inner">
- <div class="container" style="width: auto; padding: 0 20px;">
- <a class="brand" href="#">{{_i}}Title{{/i}}</a>
- <ul class="nav">
- <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>
- </ul>
- </div>
+ <div class="container" style="width: auto;">
+ <a class="brand" href="#">{{_i}}Title{{/i}}</a>
+ <ul class="nav">
+ <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>
+ </ul>
</div>
</div>
</div>{{! /example }}
@@ -1139,15 +1125,13 @@
<p>{{_i}}Add <code>.navbar-fixed-bottom</code> instead.{{/i}}</p>
<div class="bs-docs-example bs-navbar-bottom-example">
<div class="navbar navbar-fixed-bottom" style="position: absolute;">
- <div class="navbar-inner">
- <div class="container" style="width: auto; padding: 0 20px;">
- <a class="brand" href="#">{{_i}}Title{{/i}}</a>
- <ul class="nav">
- <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>
- </ul>
- </div>
+ <div class="container" style="width: auto;">
+ <a class="brand" href="#">{{_i}}Title{{/i}}</a>
+ <ul class="nav">
+ <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>
+ </ul>
</div>
</div>
</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>
<div class="bs-docs-example bs-navbar-top-example">
<div class="navbar navbar-static-top" style="margin: -1px -1px 0;">
- <div class="navbar-inner">
- <div class="container" style="width: auto; padding: 0 20px;">
- <a class="brand" href="#">{{_i}}Title{{/i}}</a>
- <ul class="nav">
- <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>
- </ul>
- </div>
+ <div class="container" style="width: auto;">
+ <a class="brand" href="#">{{_i}}Title{{/i}}</a>
+ <ul class="nav">
+ <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>
+ </ul>
</div>
</div>
</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>
<div class="bs-docs-example">
<div class="navbar">
- <div class="navbar-inner">
- <div class="container">
- <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>
- </a>
- <a class="brand" href="#">{{_i}}Title{{/i}}</a>
- <div class="nav-collapse collapse">
- <ul class="nav">
- <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 class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{_i}}Dropdown{{/i}} <b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="#">{{_i}}Action{{/i}}</a></li>
- <li><a href="#">{{_i}}Another action{{/i}}</a></li>
- <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
- <li class="divider"></li>
- <li class="nav-header">Nav header</li>
- <li><a href="#">{{_i}}Separated link{{/i}}</a></li>
- <li><a href="#">{{_i}}One more separated link{{/i}}</a></li>
- </ul>
- </li>
- </ul>
- <form class="navbar-search pull-left" action="">
- <input type="text" class="search-query span2" placeholder="Search">
- </form>
- <ul class="nav pull-right">
- <li><a href="#">{{_i}}Link{{/i}}</a></li>
- <li class="divider-vertical"></li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{_i}}Dropdown{{/i}} <b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="#">{{_i}}Action{{/i}}</a></li>
- <li><a href="#">{{_i}}Another action{{/i}}</a></li>
- <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
- <li class="divider"></li>
- <li><a href="#">{{_i}}Separated link{{/i}}</a></li>
- </ul>
- </li>
- </ul>
- </div><!-- /.nav-collapse -->
- </div>
- </div><!-- /navbar-inner -->
+ <div class="container">
+ <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>
+ </a>
+ <a class="brand" href="#">{{_i}}Title{{/i}}</a>
+ <div class="nav-collapse collapse">
+ <ul class="nav">
+ <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 class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{_i}}Dropdown{{/i}} <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="#">{{_i}}Action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Another action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
+ <li class="divider"></li>
+ <li class="nav-header">Nav header</li>
+ <li><a href="#">{{_i}}Separated link{{/i}}</a></li>
+ <li><a href="#">{{_i}}One more separated link{{/i}}</a></li>
+ </ul>
+ </li>
+ </ul>
+ <form class="navbar-search pull-left" action="">
+ <input type="text" class="search-query span2" placeholder="Search">
+ </form>
+ <ul class="nav pull-right">
+ <li><a href="#">{{_i}}Link{{/i}}</a></li>
+ <li class="divider-vertical"></li>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{_i}}Dropdown{{/i}} <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="#">{{_i}}Action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Another action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
+ <li class="divider"></li>
+ <li><a href="#">{{_i}}Separated link{{/i}}</a></li>
+ </ul>
+ </li>
+ </ul>
+ </div><!-- /.nav-collapse -->
+ </div>
</div><!-- /navbar -->
</div>{{! /example }}
<pre class="prettyprint linenums">
<div class="navbar">
- <div class="navbar-inner">
- <div class="container">
-
- <!-- {{_i}}.btn-navbar is used as the toggle for collapsed navbar content{{/i}} -->
- <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>
- </a>
+ <div class="container">
- <!-- {{_i}}Be sure to leave the brand out there if you want it shown{{/i}} -->
- <a class="brand" href="#">{{_i}}Project name{{/i}}</a>
+ <!-- {{_i}}.btn-navbar is used as the toggle for collapsed navbar content{{/i}} -->
+ <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>
+ </a>
- <!-- {{_i}}Everything you want hidden at 940px or less, place within here{{/i}} -->
- <div class="nav-collapse collapse">
- <!-- .nav, .navbar-search, .navbar-form, etc -->
- </div>
+ <!-- {{_i}}Be sure to leave the brand out there if you want it shown{{/i}} -->
+ <a class="brand" href="#">{{_i}}Project name{{/i}}</a>
+ <!-- {{_i}}Everything you want hidden at 940px or less, place within here{{/i}} -->
+ <div class="nav-collapse collapse">
+ <!-- .nav, .navbar-search, .navbar-form, etc -->
</div>
+
</div>
</div>
</pre>
@@ -1271,52 +1249,50 @@
<p>{{_i}}Modify the look of the navbar by adding <code>.navbar-inverse</code>.{{/i}}</p>
<div class="bs-docs-example">
<div class="navbar navbar-inverse" style="position: static;">
- <div class="navbar-inner">
- <div class="container">
- <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>
- </a>
- <a class="brand" href="#">{{_i}}Title{{/i}}</a>
- <div class="nav-collapse collapse">
- <ul class="nav">
- <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 class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{_i}}Dropdown{{/i}} <b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="#">{{_i}}Action{{/i}}</a></li>
- <li><a href="#">{{_i}}Another action{{/i}}</a></li>
- <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
- <li class="divider"></li>
- <li class="nav-header">Nav header</li>
- <li><a href="#">{{_i}}Separated link{{/i}}</a></li>
- <li><a href="#">{{_i}}One more separated link{{/i}}</a></li>
- </ul>
- </li>
- </ul>
- <form class="navbar-search pull-left" action="">
- <input type="text" class="search-query span2" placeholder="Search">
- </form>
- <ul class="nav pull-right">
- <li><a href="#">{{_i}}Link{{/i}}</a></li>
- <li class="divider-vertical"></li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{_i}}Dropdown{{/i}} <b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="#">{{_i}}Action{{/i}}</a></li>
- <li><a href="#">{{_i}}Another action{{/i}}</a></li>
- <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
- <li class="divider"></li>
- <li><a href="#">{{_i}}Separated link{{/i}}</a></li>
- </ul>
- </li>
- </ul>
- </div><!-- /.nav-collapse -->
- </div>
- </div><!-- /navbar-inner -->
+ <div class="container">
+ <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>
+ </a>
+ <a class="brand" href="#">{{_i}}Title{{/i}}</a>
+ <div class="nav-collapse collapse">
+ <ul class="nav">
+ <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 class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{_i}}Dropdown{{/i}} <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="#">{{_i}}Action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Another action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
+ <li class="divider"></li>
+ <li class="nav-header">Nav header</li>
+ <li><a href="#">{{_i}}Separated link{{/i}}</a></li>
+ <li><a href="#">{{_i}}One more separated link{{/i}}</a></li>
+ </ul>
+ </li>
+ </ul>
+ <form class="navbar-search pull-left" action="">
+ <input type="text" class="search-query span2" placeholder="Search">
+ </form>
+ <ul class="nav pull-right">
+ <li><a href="#">{{_i}}Link{{/i}}</a></li>
+ <li class="divider-vertical"></li>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{_i}}Dropdown{{/i}} <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="#">{{_i}}Action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Another action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
+ <li class="divider"></li>
+ <li><a href="#">{{_i}}Separated link{{/i}}</a></li>
+ </ul>
+ </li>
+ </ul>
+ </div><!-- /.nav-collapse -->
+ </div>
</div><!-- /navbar -->
</div>{{! /example }}
<pre class="prettyprint linenums">
diff --git a/less/navbar.less b/less/navbar.less
index a0483fe7e4605c8d05b86e1b3eb4aa2fb5aa1a8a..ca492cc7be58b308cde4a38544acbb376f7e55e9 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -9,17 +9,10 @@
// Base class and wrapper
.navbar {
overflow: visible;
+ padding: 0 20px;
margin-bottom: @baseLineHeight;
color: @navbarText;
-}
-
-// 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);
+ background-color: @navbarBackground;
border: 1px solid @navbarBorder;
.border-radius(4px);
.box-shadow(0 1px 4px rgba(0,0,0,.065));
@@ -150,9 +143,7 @@
.navbar-static-top {
position: static;
margin-bottom: 0; // remove 18px margin for default navbar
- .navbar-inner {
- .border-radius(0);
- }
+ .border-radius(0);
}
@@ -168,20 +159,14 @@
left: 0;
z-index: @zindexFixedNavbar;
margin-bottom: 0; // remove 18px margin for default navbar
-}
-.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-left: 0;
padding-right: 0;
.border-radius(0);
}
+.navbar-fixed-bottom {
+ border-width: 1px 0 0;
+}
// Reset container width
// 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-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
.navbar-fixed-bottom {
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 {
color: @navbarInverseText;
-
- .navbar-inner {
- #gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground);
- border-color: @navbarInverseBorder;
- }
+ background-color: @navbarInverseBackground;
+ border-color: @navbarInverseBorder;
.brand,
.nav > li > a {
diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less
index 9cc6e258eaa05506ca26b4dc4eb1dc130a250333..5e423e9199235f49aa04601a42f38f4881b715f2 100644
--- a/less/responsive-navbar.less
+++ b/less/responsive-navbar.less
@@ -24,8 +24,8 @@
.navbar-fixed-bottom {
margin-top: @baseLineHeight;
}
- .navbar-fixed-top .navbar-inner,
- .navbar-fixed-bottom .navbar-inner {
+ .navbar-fixed-top,
+ .navbar-fixed-bottom {
padding: 5px;
}
.navbar .container {
@@ -154,7 +154,7 @@
// STATIC NAVBAR
// -------------
- .navbar-static .navbar-inner {
+ .navbar-static {
padding-left: 10px;
padding-right: 10px;
}