From c59e5251e12a57b5f305b4996d6f164b71c7f22c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 25 Sep 2012 22:48:02 -0700 Subject: initial pass at removing navbar-inner from .navbar component --- docs/components.html | 382 ++++++++++++++++++++++++--------------------------- 1 file changed, 178 insertions(+), 204 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 6422c1611..53c416d55 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">
-
-      <!-- .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>
 

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

           

             

-              

-                

-                  
-                    
-                    
-                    
-                  
-                  Title
-                  

-                    
-                    

-                      
-                    

-                    
-                  

-                

-              

+              

+                
+                  
+                  
+                  
+                
+                Title
+                

+                  
+                  

+                    
+                  

+                  
+                

+              

             

           

 
-- 
cgit v1.2.3