]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ea1c21d)
turn off brand hover for now + get nav toggling in mobile
authorJacob Thornton <jacobthornton@gmail.com>
Sat, 28 Jan 2012 23:42:07 +0000 (15:42 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Sat, 28 Jan 2012 23:42:07 +0000 (15:42 -0800)
15 files changed:
docs/assets/css/bootstrap-responsive.css patch | blob | blame | history
docs/assets/css/bootstrap.css patch | blob | blame | history
docs/base-css.html patch | blob | blame | history
docs/components.html patch | blob | blame | history
docs/download.html patch | blob | blame | history
docs/examples.html patch | blob | blame | history
docs/index.html patch | blob | blame | history
docs/javascript.html patch | blob | blame | history
docs/less.html patch | blob | blame | history
docs/scaffolding.html patch | blob | blame | history
docs/templates/layout.mustache patch | blob | blame | history
docs/upgrading.html patch | blob | blame | history
less/accordion.less patch | blob | blame | history
less/navbar.less patch | blob | blame | history
less/responsive.less patch | blob | blame | history

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 3731713e82883e1f82f8f407013563884511ab9c..631c904e7937667c055412b26192302028a16d1a 100644 (file)
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -86,9 +86,6 @@
     width: auto;
     margin: 0;
   }
-  .btn-navbar {
-    display: block;
-  }
 }
 @media (min-width: 768px) and (max-width: 940px) {
   .container {
@@ -258,6 +255,13 @@
     padding-left: 10px;
     padding-right: 10px;
   }
+  .btn-navbar {
+    display: block;
+  }
+  .nav-collapse {
+    overflow: hidden;
+    height: 0;
+  }
 }
 /*
 @media (min-width: 1210px) {
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index e538be2a40c35f0096755ad7a30cb72190935d1d..e928bb6d1e052caa993bdbd7ebc7ded31175ee15 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2356,7 +2356,6 @@ button.btn.small, input[type="submit"].btn.small {
   margin-top: 3px;
 }
 .navbar .brand:hover {
-  color: #ffffff;
   text-decoration: none;
 }
 .navbar .brand {
diff --git a/docs/base-css.html b/docs/base-css.html
index aa0ac664fc75592e5a47a6ceebb2a2d7dc2dc5ee..c68391261c110d0dc727740e175d115175ab26d2 100644 (file)
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -26,42 +26,44 @@
   </head>
 
   <body data-spy="scroll" data-target=".subnav" data-offset="50">
-  
-  
+
+
   <!-- Navbar
     ================================================== -->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
-          <a class="btn btn-navbar">
+          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="i-bar"></span>
             <span class="i-bar"></span>
             <span class="i-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <ul class="nav">
-            <li class="">
-              <a href="./index.html">Overview</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 plugins</a>
-            </li>
-            <li class="">
-              <a href="./less.html">Using LESS</a>
-            </li>
-            <li class="">
-              <a href="./download.html">Customize</a>
-            </li>
-          </ul>
+          <div class="nav-collapse">
+            <ul class="nav">
+              <li class="">
+                <a href="./index.html">Overview</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 plugins</a>
+              </li>
+              <li class="">
+                <a href="./less.html">Using LESS</a>
+              </li>
+              <li class="">
+                <a href="./download.html">Customize</a>
+              </li>
+            </ul>
+          </div>
         </div>
       </div>
     </div>
diff --git a/docs/components.html b/docs/components.html
index f584d90bd29cf4086d33dbff2592ba189564e5fa..a2fac7360b21bb9b21b1be68d98d289f8aee9528 100644 (file)
--- a/docs/components.html
+++ b/docs/components.html
@@ -26,42 +26,44 @@
   </head>
 
   <body data-spy="scroll" data-target=".subnav" data-offset="50">
-  
-  
+
+
   <!-- Navbar
     ================================================== -->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
-          <a class="btn btn-navbar">
+          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="i-bar"></span>
             <span class="i-bar"></span>
             <span class="i-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <ul class="nav">
-            <li class="">
-              <a href="./index.html">Overview</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 plugins</a>
-            </li>
-            <li class="">
-              <a href="./less.html">Using LESS</a>
-            </li>
-            <li class="">
-              <a href="./download.html">Customize</a>
-            </li>
-          </ul>
+          <div class="nav-collapse">
+            <ul class="nav">
+              <li class="">
+                <a href="./index.html">Overview</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 plugins</a>
+              </li>
+              <li class="">
+                <a href="./less.html">Using LESS</a>
+              </li>
+              <li class="">
+                <a href="./download.html">Customize</a>
+              </li>
+            </ul>
+          </div>
         </div>
       </div>
     </div>
diff --git a/docs/download.html b/docs/download.html
index 22feac3440da85e6341efcd035733a2e7a6dff65..5bcce7cedce6ca2fd2bea205208df40aefa59ee7 100644 (file)
--- a/docs/download.html
+++ b/docs/download.html
@@ -26,42 +26,44 @@
   </head>
 
   <body data-spy="scroll" data-target=".subnav" data-offset="50">
-  
-  
+
+
   <!-- Navbar
     ================================================== -->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
-          <a class="btn btn-navbar">
+          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="i-bar"></span>
             <span class="i-bar"></span>
             <span class="i-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <ul class="nav">
-            <li class="">
-              <a href="./index.html">Overview</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 plugins</a>
-            </li>
-            <li class="">
-              <a href="./less.html">Using LESS</a>
-            </li>
-            <li class="active">
-              <a href="./download.html">Customize</a>
-            </li>
-          </ul>
+          <div class="nav-collapse">
+            <ul class="nav">
+              <li class="">
+                <a href="./index.html">Overview</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 plugins</a>
+              </li>
+              <li class="">
+                <a href="./less.html">Using LESS</a>
+              </li>
+              <li class="active">
+                <a href="./download.html">Customize</a>
+              </li>
+            </ul>
+          </div>
         </div>
       </div>
     </div>
diff --git a/docs/examples.html b/docs/examples.html
index a43b5bec7494085cdb877e08613fb61f1ff3f96b..70a1a54dda0ddd8e4e4bb040fe24fce7523a4c5a 100644 (file)
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -26,42 +26,44 @@
   </head>
 
   <body data-spy="scroll" data-target=".subnav" data-offset="50">
-  
-  
+
+
   <!-- Navbar
     ================================================== -->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
-          <a class="btn btn-navbar">
+          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="i-bar"></span>
             <span class="i-bar"></span>
             <span class="i-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <ul class="nav">
-            <li class="">
-              <a href="./index.html">Overview</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 plugins</a>
-            </li>
-            <li class="">
-              <a href="./less.html">Using LESS</a>
-            </li>
-            <li class="">
-              <a href="./download.html">Customize</a>
-            </li>
-          </ul>
+          <div class="nav-collapse">
+            <ul class="nav">
+              <li class="">
+                <a href="./index.html">Overview</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 plugins</a>
+              </li>
+              <li class="">
+                <a href="./less.html">Using LESS</a>
+              </li>
+              <li class="">
+                <a href="./download.html">Customize</a>
+              </li>
+            </ul>
+          </div>
         </div>
       </div>
     </div>
diff --git a/docs/index.html b/docs/index.html
index bb63674a89d35e56913fe1e090cfdcdd78f6bfc2..89f5accd68b3e5ff9495319a98379a73b943e417 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -26,42 +26,44 @@
   </head>
 
   <body data-spy="scroll" data-target=".subnav" data-offset="50">
-  
-  
+
+
   <!-- Navbar
     ================================================== -->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
-          <a class="btn btn-navbar">
+          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="i-bar"></span>
             <span class="i-bar"></span>
             <span class="i-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <ul class="nav">
-            <li class="active">
-              <a href="./index.html">Overview</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 plugins</a>
-            </li>
-            <li class="">
-              <a href="./less.html">Using LESS</a>
-            </li>
-            <li class="">
-              <a href="./download.html">Customize</a>
-            </li>
-          </ul>
+          <div class="nav-collapse">
+            <ul class="nav">
+              <li class="active">
+                <a href="./index.html">Overview</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 plugins</a>
+              </li>
+              <li class="">
+                <a href="./less.html">Using LESS</a>
+              </li>
+              <li class="">
+                <a href="./download.html">Customize</a>
+              </li>
+            </ul>
+          </div>
         </div>
       </div>
     </div>
diff --git a/docs/javascript.html b/docs/javascript.html
index adc73d462e417deea9d3f98c1a07ea0dfa1fb802..eb4a175c33553bbf4791b9d8af75b4cdcd22ba77 100644 (file)
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -26,42 +26,44 @@
   </head>
 
   <body data-spy="scroll" data-target=".subnav" data-offset="50">
-  
-  
+
+
   <!-- Navbar
     ================================================== -->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
-          <a class="btn btn-navbar">
+          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="i-bar"></span>
             <span class="i-bar"></span>
             <span class="i-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <ul class="nav">
-            <li class="">
-              <a href="./index.html">Overview</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 plugins</a>
-            </li>
-            <li class="">
-              <a href="./less.html">Using LESS</a>
-            </li>
-            <li class="">
-              <a href="./download.html">Customize</a>
-            </li>
-          </ul>
+          <div class="nav-collapse">
+            <ul class="nav">
+              <li class="">
+                <a href="./index.html">Overview</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 plugins</a>
+              </li>
+              <li class="">
+                <a href="./less.html">Using LESS</a>
+              </li>
+              <li class="">
+                <a href="./download.html">Customize</a>
+              </li>
+            </ul>
+          </div>
         </div>
       </div>
     </div>
diff --git a/docs/less.html b/docs/less.html
index 165852a3f5590b08033e37ef6d707d0bbf903a03..497a9dfe316fd9d289b06104201eec3e545c59ad 100644 (file)
--- a/docs/less.html
+++ b/docs/less.html
@@ -26,42 +26,44 @@
   </head>
 
   <body data-spy="scroll" data-target=".subnav" data-offset="50">
-  
-  
+
+
   <!-- Navbar
     ================================================== -->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
-          <a class="btn btn-navbar">
+          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="i-bar"></span>
             <span class="i-bar"></span>
             <span class="i-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <ul class="nav">
-            <li class="">
-              <a href="./index.html">Overview</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 plugins</a>
-            </li>
-            <li class="active">
-              <a href="./less.html">Using LESS</a>
-            </li>
-            <li class="">
-              <a href="./download.html">Customize</a>
-            </li>
-          </ul>
+          <div class="nav-collapse">
+            <ul class="nav">
+              <li class="">
+                <a href="./index.html">Overview</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 plugins</a>
+              </li>
+              <li class="active">
+                <a href="./less.html">Using LESS</a>
+              </li>
+              <li class="">
+                <a href="./download.html">Customize</a>
+              </li>
+            </ul>
+          </div>
         </div>
       </div>
     </div>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 2b797ded79ed1db55c6224fd2f0a4b968c47d641..14da044bbad1695aba444467fdfe8d0dcee12b2c 100644 (file)
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -26,42 +26,44 @@
   </head>
 
   <body data-spy="scroll" data-target=".subnav" data-offset="50">
-  
-  
+
+
   <!-- Navbar
     ================================================== -->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
-          <a class="btn btn-navbar">
+          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="i-bar"></span>
             <span class="i-bar"></span>
             <span class="i-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <ul class="nav">
-            <li class="">
-              <a href="./index.html">Overview</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 plugins</a>
-            </li>
-            <li class="">
-              <a href="./less.html">Using LESS</a>
-            </li>
-            <li class="">
-              <a href="./download.html">Customize</a>
-            </li>
-          </ul>
+          <div class="nav-collapse">
+            <ul class="nav">
+              <li class="">
+                <a href="./index.html">Overview</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 plugins</a>
+              </li>
+              <li class="">
+                <a href="./less.html">Using LESS</a>
+              </li>
+              <li class="">
+                <a href="./download.html">Customize</a>
+              </li>
+            </ul>
+          </div>
         </div>
       </div>
     </div>
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 673673dff4ce5468a97810c8c8ff6309d63e2599..7c0ab655be12ab9647a49a8b2de3aa0acb8f0ca2 100644 (file)
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -26,42 +26,44 @@
   </head>
 
   <body data-spy="scroll" data-target=".subnav" data-offset="50">
-  
-  
+
+
   <!-- Navbar
     ================================================== -->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
-          <a class="btn btn-navbar">
+          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="i-bar"></span>
             <span class="i-bar"></span>
             <span class="i-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <ul class="nav">
-            <li class="{{index}}">
-              <a href="./index.html">{{_i}}Overview{{/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 plugins{{/i}}</a>
-            </li>
-            <li class="{{less}}">
-              <a href="./less.html">{{_i}}Using LESS{{/i}}</a>
-            </li>
-            <li class="{{download}}">
-              <a href="./download.html">{{_i}}Customize{{/i}}</a>
-            </li>
-          </ul>
+          <div class="nav-collapse">
+            <ul class="nav">
+              <li class="{{index}}">
+                <a href="./index.html">{{_i}}Overview{{/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 plugins{{/i}}</a>
+              </li>
+              <li class="{{less}}">
+                <a href="./less.html">{{_i}}Using LESS{{/i}}</a>
+              </li>
+              <li class="{{download}}">
+                <a href="./download.html">{{_i}}Customize{{/i}}</a>
+              </li>
+            </ul>
+          </div>
         </div>
       </div>
     </div>
diff --git a/docs/upgrading.html b/docs/upgrading.html
index f1f2a4303f812f2ad261eed23da38a368e033ec8..c0778d9d072ee35c79c621b99a127f2ffbb51401 100644 (file)
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -26,42 +26,44 @@
   </head>
 
   <body data-spy="scroll" data-target=".subnav" data-offset="50">
-  
-  
+
+
   <!-- Navbar
     ================================================== -->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
-          <a class="btn btn-navbar">
+          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="i-bar"></span>
             <span class="i-bar"></span>
             <span class="i-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <ul class="nav">
-            <li class="">
-              <a href="./index.html">Overview</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 plugins</a>
-            </li>
-            <li class="">
-              <a href="./less.html">Using LESS</a>
-            </li>
-            <li class="">
-              <a href="./download.html">Customize</a>
-            </li>
-          </ul>
+          <div class="nav-collapse">
+            <ul class="nav">
+              <li class="">
+                <a href="./index.html">Overview</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 plugins</a>
+              </li>
+              <li class="">
+                <a href="./less.html">Using LESS</a>
+              </li>
+              <li class="">
+                <a href="./download.html">Customize</a>
+              </li>
+            </ul>
+          </div>
         </div>
       </div>
     </div>
diff --git a/less/accordion.less b/less/accordion.less
index d5c00238c6f190df0b7d87c3fc7154f2f831a378..1ebd5b1a1a7c0b9fa37d8d48b1f93f4d14697107 100644 (file)
--- a/less/accordion.less
+++ b/less/accordion.less
@@ -1,5 +1,5 @@
-// COLLAPSE
-// --------
+// ACCORDION
+// ---------
 
 
 // Parent container
diff --git a/less/navbar.less b/less/navbar.less
index a72c0d74eb7869c62433f0dd77ac2e56fa61922d..379cbb56d9d19267227c79d74c39e5a20429224b 100644 (file)
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -43,7 +43,6 @@
 .navbar {
   // Hover and active states
   .brand:hover {
-    color: @white;
     text-decoration: none;
   }
   // Website or project name
@@ -286,4 +285,4 @@
     left: auto;
     right: 13px;
   }
-}
+}
\ No newline at end of file
diff --git a/less/responsive.less b/less/responsive.less
index cc3b2882f6c90f436891da54b598cc6537dbb8e7..6c3102c14f0c4a21fb5e5f7d0816e8c93b5555dd 100644 (file)
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -126,12 +126,6 @@
     width: auto;
     margin: 0;
   }
-
-  // Navbar button
-  .btn-navbar {
-    display: block;
-  }
-
 }
 
 
@@ -292,6 +286,15 @@
     padding-left:  10px;
     padding-right: 10px;
   }
+  // Navbar button
+  .btn-navbar {
+    display: block;
+  }
+
+  .nav-collapse {
+    overflow: hidden;
+    height: 0;
+  }
 
 }
 
Mirror of https://github.com/twbs/bootstrap.git