diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index f456bc2137..671cdd3c7c 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 057753c3bb..4e7d61c2f6 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 3226994523..4abea08c7a 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 4a4b46b478..1cf7002363 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -32,39 +32,37 @@
-
-
- - Bootstrap -
- -
+
+ + Bootstrap +
+
diff --git a/docs/components.html b/docs/components.html index 6422c1611d..53c416d55e 100644 --- a/docs/components.html +++ b/docs/components.html @@ -32,39 +32,37 @@
-
-
- - Bootstrap -
- -
+
+ + Bootstrap +
+
@@ -1031,26 +1029,22 @@

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 .container, which sets the width of your site and content.

-
- Title - -
+ Title + 
 <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>
@@ -1064,9 +1058,7 @@

A simple link to show your brand or project name only requires an anchor tag.

-
- Title -
+ Title 
@@ -1077,13 +1069,11 @@
           
Nav items are simple to add via unordered lists.

           

             

-              

-                
-              

+              
             

           

 
@@ -1122,12 +1112,10 @@
           
To properly style and position a form within the navbar, add the appropriate classes as shown below. For a default form, include .navbar-form and either .pull-left or .pull-right to properly align it.

           

             

-              

-                

-                  
-                  
-                

-              

+              

+                
+                
+              

             

           

 
@@ -1141,11 +1129,9 @@
           
For a more customized search form, add .navbar-search to the form and .search-query to the input for specialized styles in the navbar.

           

             

-              

-                

-                  
-                

-              

+              

+                
+              

             

           

 
@@ -1188,15 +1174,13 @@
           
Add .navbar-fixed-top and remember to account for the hidden area underneath it by adding at least 40px padding to the <body>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.

           

             

-              

-                

-                  Title
-                  
-                

+              

+                Title
+                
               

             

           

@@ -1210,15 +1194,13 @@
           
Add .navbar-fixed-bottom instead.

           

             

-              

-                

-                  Title
-                  
-                

+              

+                Title
+                
               

             

           

@@ -1232,15 +1214,13 @@
           
Create a full-width navbar that scrolls away with the page by adding .navbar-static-top. Unlike the .navbar-fixed-top class, you do not need to change any padding on the body.

           

             

-              

-                

-                  Title
-                  
-                

+              

+                Title
+                
               

             

           

@@ -1258,75 +1238,71 @@
           
To implement a collapsing responsive navbar, wrap your navbar content in a containing div, .nav-collapse.collapse, and add the navbar toggle button, .btn-navbar.

           

             

-              

-                

-                  
-                    
-                    
-                    
-                  
-                  Title
-                  

-                    
-                    

-                      
-                    

-                    
-                  

-                

-              

+              

+                
+                  
+                  
+                  
+                
+                Title
+                

+                  
+                  

+                    
+                  

+                  
+                

+              

             

           

 
 <div class="navbar">
-  <div class="navbar-inner">
-    <div class="container">
+  <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>
+    <!-- .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>
 
-      <!-- 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>
+    <!-- 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>
 

@@ -1342,52 +1318,50 @@
           
Modify the look of the navbar by adding .navbar-inverse.

           

             

-              

-                

-                  
-                    
-                    
-                    
-                  
-                  Title
-                  

-                    
-                    

-                      
-                    

-                    
-                  

-                

-              

+              

+                
+                  
+                  
+                  
+                
+                Title
+                

+                  
+                  

+                    
+                  

+                  
+                

+              

             

           

 
diff --git a/docs/customize.html b/docs/customize.html
index 4673189fce..964ac1da31 100644
--- a/docs/customize.html
+++ b/docs/customize.html
@@ -32,39 +32,37 @@
     
     

-      

-        

-          
-          Bootstrap
-          

-            
-          

+      

+        
+        Bootstrap
+        

+          
         

       

     

diff --git a/docs/extend.html b/docs/extend.html
index 4c55a7220e..58d14701ae 100644
--- a/docs/extend.html
+++ b/docs/extend.html
@@ -32,39 +32,37 @@
     
     

-      

-        

-          
-          Bootstrap
-          

-            
-          

+      

+        
+        Bootstrap
+        

+          
         

       

     

diff --git a/docs/getting-started.html b/docs/getting-started.html
index b81c79ed65..6abb56f082 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -32,39 +32,37 @@
     
     

-      

-        

-          
-          Bootstrap
-          

-            
-          

+      

+        
+        Bootstrap
+        

+          
         

       

     

diff --git a/docs/index.html b/docs/index.html
index 9d0beba7ea..f9961372f9 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -32,39 +32,37 @@
     
     

-      

-        

-          
-          Bootstrap
-          

-            
-          

+      

+        
+        Bootstrap
+        

+          
         

       

     

diff --git a/docs/javascript.html b/docs/javascript.html
index 6c028e01e5..0dcd2053db 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -32,39 +32,37 @@
     
     

-      

-        

-          
-          Bootstrap
-          

-            
-          

+      

+        
+        Bootstrap
+        

+          
         

       

     

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 4a84e353fc..6e6c0b9924 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -32,39 +32,37 @@
     
     

-      

-        

-          
-          Bootstrap
-          

-            
-          

+      

+        
+        Bootstrap
+        

+          
         

       

     

diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 2f0e1e8566..db769d65b1 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -44,39 +44,37 @@
     
     

-      

-        

-          
-          Bootstrap
-          

-            
-          

+      

+        
+        Bootstrap
+        

+          
         

       

     

diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 15f60f5c12..7389f7985f 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -960,26 +960,22 @@
           
{{_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 .container, which sets the width of your site and content.{{/i}}

           

             

-              

-                {{_i}}Title{{/i}}
-                
-              

+              {{_i}}Title{{/i}}
+              
             

           
{{! /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>
 

 
@@ -993,9 +989,7 @@
           
{{_i}}A simple link to show your brand or project name only requires an anchor tag.{{/i}}

           

             

-              

-                {{_i}}Title{{/i}}
-              

+              {{_i}}Title{{/i}}
             

           
{{! /example }}
 
@@ -1006,13 +1000,11 @@
           
{{_i}}Nav items are simple to add via unordered lists.{{/i}}

           

             

-              

-                
-              

+              
             

           
{{! /example }}
 
@@ -1051,12 +1043,10 @@
           
{{_i}}To properly style and position a form within the navbar, add the appropriate classes as shown below. For a default form, include .navbar-form and either .pull-left or .pull-right to properly align it.{{/i}}

           

             

-              

-                

-                  
-                  
-                

-              

+              

+                
+                
+              

             

           
{{! /example }}
 
@@ -1070,11 +1060,9 @@
           
{{_i}}For a more customized search form, add .navbar-search to the form and .search-query to the input for specialized styles in the navbar.{{/i}}

           

             

-              

-                

-                  
-                

-              

+              

+                
+              

             

           
{{! /example }}
 
@@ -1117,15 +1105,13 @@
           
{{_i}}Add .navbar-fixed-top and remember to account for the hidden area underneath it by adding at least 40px padding to the <body>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.{{/i}}

           

             

-              

-                

-                  {{_i}}Title{{/i}}
-                  
-                

+              

+                {{_i}}Title{{/i}}
+                
               

             

           
{{! /example }}
@@ -1139,15 +1125,13 @@
           
{{_i}}Add .navbar-fixed-bottom instead.{{/i}}

           

             

-              

-                

-                  {{_i}}Title{{/i}}
-                  
-                

+              

+                {{_i}}Title{{/i}}
+                
               

             

           
{{! /example }}
@@ -1161,15 +1145,13 @@
           
{{_i}}Create a full-width navbar that scrolls away with the page by adding .navbar-static-top. Unlike the .navbar-fixed-top class, you do not need to change any padding on the body.{{/i}}

           

             

-              

-                

-                  {{_i}}Title{{/i}}
-                  
-                

+              

+                {{_i}}Title{{/i}}
+                
               

             

           
{{! /example }}
@@ -1187,75 +1169,71 @@
           
{{_i}}To implement a collapsing responsive navbar, wrap your navbar content in a containing div, .nav-collapse.collapse, and add the navbar toggle button, .btn-navbar.{{/i}}

           

             

-              

-                

-                  
-                    
-                    
-                    
-                  
-                  {{_i}}Title{{/i}}
-                  

-                    
-                    

-                      
-                    

-                    
-                  

-                

-              

+              

+                
+                  
+                  
+                  
+                
+                {{_i}}Title{{/i}}
+                

+                  
+                  

+                    
+                  

+                  
+                

+              

             

           
{{! /example }}
 
 <div class="navbar">
-  <div class="navbar-inner">
-    <div class="container">
+  <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>
+    <!-- {{_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}}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>
+    <!-- {{_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>
 

@@ -1271,52 +1249,50 @@
           
{{_i}}Modify the look of the navbar by adding .navbar-inverse.{{/i}}

           

             

-              

-                

-                  
-                    
-                    
-                    
-                  
-                  {{_i}}Title{{/i}}
-                  

-                    
-                    

-                      
-                    

-                    
-                  

-                

-              

+              

+                
+                  
+                  
+                  
+                
+                {{_i}}Title{{/i}}
+                

+                  
+                  

+                    
+                  

+                  
+                

+              

             

           
{{! /example }}
 
diff --git a/less/navbar.less b/less/navbar.less
index a0483fe7e4..ca492cc7be 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 9cc6e258ea..5e423e9199 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;
   }