initial pass at removing navbar-inner from .navbar component

docs/assets/css/bootstrap-responsive.css

@@ -590,8 +590,8 @@
   .navbar-fixed-bottom {
     margin-top: 20px;
   }
-  .navbar-fixed-top .navbar-inner,
+  .navbar-fixed-top,
-  .navbar-fixed-bottom .navbar-inner {
+  .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;
   }

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;
-}
+  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;
   -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:before,
-.navbar-inner:after {
+.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-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);
      -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;
-}
+  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;
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
 }
 
 .navbar-inverse .brand,

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 */

docs/base-css.html

@@ -32,7 +32,6 @@
     <!-- 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>
@@ -67,7 +66,6 @@
         </div>
       </div>
     </div>
-    </div>
 
 <!-- Subhead
 ================================================== -->

docs/components.html

@@ -32,7 +32,6 @@
     <!-- 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>
@@ -67,7 +66,6 @@
         </div>
       </div>
     </div>
-    </div>
 
 <!-- Subhead
 ================================================== -->
@@ -1031,7 +1029,6 @@
           <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>
@@ -1040,17 +1037,14 @@
               </ul>
             </div>
           </div>
-          </div>
 <pre class="prettyprint linenums">
 &lt;div class="navbar"&gt;
-  &lt;div class="navbar-inner"&gt;
   &lt;a class="brand" href="#"&gt;Title&lt;/a&gt;
   &lt;ul class="nav"&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;/ul&gt;
-  &lt;/div&gt;
 &lt;/div&gt;
 </pre>
 
@@ -1064,11 +1058,9 @@
           <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>
           </div>
-          </div>
 <pre class="prettyprint linenums">
 &lt;a class="brand" href="#"&gt;Project name&lt;/a&gt;
 </pre>
@@ -1077,7 +1069,6 @@
           <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>
@@ -1085,7 +1076,6 @@
               </ul>
             </div>
           </div>
-          </div>
 <pre class="prettyprint linenums">
 &lt;ul class="nav"&gt;
   &lt;li class="active"&gt;
@@ -1122,14 +1112,12 @@
           <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>
           </div>
-          </div>
 <pre class="prettyprint linenums">
 &lt;form class="navbar-form pull-left"&gt;
   &lt;input type="text" class="span2"&gt;
@@ -1141,13 +1129,11 @@
           <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>
           </div>
-          </div>
 <pre class="prettyprint linenums">
 &lt;form class="navbar-search pull-left"&gt;
   &lt;input type="text" class="search-query" placeholder="Search"&gt;
@@ -1188,8 +1174,7 @@
           <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="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>
                 <ul class="nav">
                   <li class="active"><a href="#">Home</a></li>
@@ -1199,7 +1184,6 @@
               </div>
             </div>
           </div>
-          </div>
 <pre class="prettyprint linenums">
 &lt;div class="navbar navbar-fixed-top"&gt;
   ...
@@ -1210,8 +1194,7 @@
           <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;">
-                <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>
@@ -1221,7 +1204,6 @@
               </div>
             </div>
           </div>
-          </div>
 <pre class="prettyprint linenums">
 &lt;div class="navbar navbar-fixed-bottom"&gt;
   ...
@@ -1232,8 +1214,7 @@
           <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;">
-                <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>
@@ -1243,7 +1224,6 @@
               </div>
             </div>
           </div>
-          </div>
 <pre class="prettyprint linenums">
 &lt;div class="navbar navbar-static-top"&gt;
   ...
@@ -1258,7 +1238,6 @@
           <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>
@@ -1303,12 +1282,10 @@
                   </ul>
                 </div><!-- /.nav-collapse -->
               </div>
-              </div><!-- /navbar-inner -->
             </div><!-- /navbar -->
           </div>
 <pre class="prettyprint linenums">
 &lt;div class="navbar"&gt;
-  &lt;div class="navbar-inner"&gt;
   &lt;div class="container"&gt;
 
     &lt;!-- .btn-navbar is used as the toggle for collapsed navbar content --&gt;
@@ -1327,7 +1304,6 @@
     &lt;/div&gt;
 
   &lt;/div&gt;
-  &lt;/div&gt;
 &lt;/div&gt;
 </pre>
           <div class="alert alert-info">
@@ -1342,7 +1318,6 @@
           <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>
@@ -1387,7 +1362,6 @@
                   </ul>
                 </div><!-- /.nav-collapse -->
               </div>
-              </div><!-- /navbar-inner -->
             </div><!-- /navbar -->
           </div>
 <pre class="prettyprint linenums">

docs/customize.html

@@ -32,7 +32,6 @@
     <!-- 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>
@@ -67,7 +66,6 @@
         </div>
       </div>
     </div>
-    </div>
 
 <!-- Masthead
 ================================================== -->

docs/extend.html

@@ -32,7 +32,6 @@
     <!-- 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>
@@ -67,7 +66,6 @@
         </div>
       </div>
     </div>
-    </div>
 
 <!-- Subhead
 ================================================== -->

docs/getting-started.html

@@ -32,7 +32,6 @@
     <!-- 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>
@@ -67,7 +66,6 @@
         </div>
       </div>
     </div>
-    </div>
 
 <!-- Subhead
 ================================================== -->

docs/index.html

@@ -32,7 +32,6 @@
     <!-- 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>
@@ -67,7 +66,6 @@
         </div>
       </div>
     </div>
-    </div>
 
 <div class="jumbotron masthead">
   <div class="container">

docs/javascript.html

@@ -32,7 +32,6 @@
     <!-- 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>
@@ -67,7 +66,6 @@
         </div>
       </div>
     </div>
-    </div>
 
 <!-- Subhead
 ================================================== -->

docs/scaffolding.html

@@ -32,7 +32,6 @@
     <!-- 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>
@@ -67,7 +66,6 @@
         </div>
       </div>
     </div>
-    </div>
 
 <!-- Subhead
 ================================================== -->

docs/templates/layout.mustache

@@ -44,7 +44,6 @@
     <!-- 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>
@@ -79,7 +78,6 @@
         </div>
       </div>
     </div>
-    </div>
 
 {{>body}}
 

docs/templates/pages/components.mustache

@@ -960,7 +960,6 @@
           <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>
@@ -968,18 +967,15 @@
                 <li><a href="#">{{_i}}Link{{/i}}</a></li>
               </ul>
             </div>
-            </div>
           </div>{{! /example }}
 <pre class="prettyprint linenums">
 &lt;div class="navbar"&gt;
-  &lt;div class="navbar-inner"&gt;
   &lt;a class="brand" href="#"&gt;{{_i}}Title{{/i}}&lt;/a&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&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;/div&gt;
 &lt;/div&gt;
 </pre>
 
@@ -993,10 +989,8 @@
           <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>
-            </div>
           </div>{{! /example }}
 <pre class="prettyprint linenums">
 &lt;a class="brand" href="#"&gt;{{_i}}Project name{{/i}}&lt;/a&gt;
@@ -1006,14 +1000,12 @@
           <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>
-            </div>
           </div>{{! /example }}
 <pre class="prettyprint linenums">
 &lt;ul class="nav"&gt;
@@ -1051,13 +1043,11 @@
           <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>
-            </div>
           </div>{{! /example }}
 <pre class="prettyprint linenums">
 &lt;form class="navbar-form pull-left"&gt;
@@ -1070,12 +1060,10 @@
           <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>
-            </div>
           </div>{{! /example }}
 <pre class="prettyprint linenums">
 &lt;form class="navbar-search pull-left"&gt;
@@ -1117,8 +1105,7 @@
           <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="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>
                 <ul class="nav">
                   <li class="active"><a href="#">{{_i}}Home{{/i}}</a></li>
@@ -1127,7 +1114,6 @@
                 </ul>
               </div>
             </div>
-            </div>
           </div>{{! /example }}
 <pre class="prettyprint linenums">
 &lt;div class="navbar navbar-fixed-top"&gt;
@@ -1139,8 +1125,7 @@
           <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;">
-                <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>
@@ -1149,7 +1134,6 @@
                 </ul>
               </div>
             </div>
-            </div>
           </div>{{! /example }}
 <pre class="prettyprint linenums">
 &lt;div class="navbar navbar-fixed-bottom"&gt;
@@ -1161,8 +1145,7 @@
           <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;">
-                <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>
@@ -1171,7 +1154,6 @@
                 </ul>
               </div>
             </div>
-            </div>
           </div>{{! /example }}
 <pre class="prettyprint linenums">
 &lt;div class="navbar navbar-static-top"&gt;
@@ -1187,7 +1169,6 @@
           <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>
@@ -1232,12 +1213,10 @@
                   </ul>
                 </div><!-- /.nav-collapse -->
               </div>
-              </div><!-- /navbar-inner -->
             </div><!-- /navbar -->
           </div>{{! /example }}
 <pre class="prettyprint linenums">
 &lt;div class="navbar"&gt;
-  &lt;div class="navbar-inner"&gt;
   &lt;div class="container"&gt;
 
     &lt;!-- {{_i}}.btn-navbar is used as the toggle for collapsed navbar content{{/i}} --&gt;
@@ -1256,7 +1235,6 @@
     &lt;/div&gt;
 
   &lt;/div&gt;
-  &lt;/div&gt;
 &lt;/div&gt;
 </pre>
           <div class="alert alert-info">
@@ -1271,7 +1249,6 @@
           <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>
@@ -1316,7 +1293,6 @@
                   </ul>
                 </div><!-- /.nav-collapse -->
               </div>
-              </div><!-- /navbar-inner -->
             </div><!-- /navbar -->
           </div>{{! /example }}
 <pre class="prettyprint linenums">

less/navbar.less

@@ -9,17 +9,10 @@
 // Base class and wrapper
 .navbar {
   overflow: visible;
+  padding: 0 20px;
   margin-bottom: @baseLineHeight;
   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-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);
-  }
 }
 
 
@@ -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)");
-  }
 }
 
 // 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)");
-  }
 }
 
 
@@ -376,11 +357,8 @@
 
 .navbar-inverse {
   color: @navbarInverseText;
-
+  background-color: @navbarInverseBackground;
-  .navbar-inner {
-    #gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground);
   border-color: @navbarInverseBorder;
-  }
 
   .brand,
   .nav > li > a {

less/responsive-navbar.less

@@ -24,8 +24,8 @@
   .navbar-fixed-bottom {
     margin-top: @baseLineHeight;
   }
-  .navbar-fixed-top .navbar-inner,
+  .navbar-fixed-top,
-  .navbar-fixed-bottom .navbar-inner {
+  .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;
   }