nuke uber footer, bring back topbar dropdowns

diff --git a/bootstrap.css b/bootstrap.css
index 8d08470121d26fd8ebf17aa7c6d1550d09275506..8e5ad131c1ecace4f6d3b8d5cee288afdea0cb42 100644 (file)
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Thu Jan 12 12:30:32 PST 2012
+ * Date: Thu Jan 12 15:28:03 PST 2012
  */
 html, body {
   margin: 0;
@@ -1453,12 +1453,12 @@ i {
   min-width: 160px;
   max-width: 220px;
   _width: 160px;
-  padding: 5px 0;
+  padding: 4px 0;
   margin: 0;
   list-style: none;
   background-color: #ffffff;
   border-color: #999;
-  border-color: rgba(0, 0, 0, 0.1);
+  border-color: rgba(0, 0, 0, 0.2);
   border-style: solid;
   border-width: 1px;
   -webkit-border-radius: 0 0 5px 5px;
@@ -1486,24 +1486,12 @@ i {
   font-weight: normal;
   line-height: 18px;
   color: #555555;
+  white-space: nowrap;
 }
 .dropdown-menu li > a:hover {
   color: #fff;
   text-decoration: none;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #0077b3;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#0088cc), to(#0077b3));
-  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -ms-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #0088cc), color-stop(100%, #0077b3));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
-  background-image: linear-gradient(top, #0088cc, #0077b3);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0077b3', GradientType=0);
-  -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075);
-  -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075);
+  background-color: #0088cc;
 }
 .dropdown-menu .active > a, .dropdown-menu .active > a:hover {
   color: #fff;
@@ -1747,7 +1735,7 @@ i {
   margin-right: 0;
 }
 .navbar .dropdown-menu {
-  top: 42px;
+  top: 41px;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
@@ -1758,10 +1746,10 @@ i {
   border-left: 7px solid transparent;
   border-right: 7px solid transparent;
   border-bottom: 7px solid #ccc;
-  border-bottom-color: rgba(0, 0, 0, 0.1);
+  border-bottom-color: rgba(0, 0, 0, 0.2);
   position: absolute;
   top: -7px;
-  left: 12px;
+  left: 9px;
 }
 .navbar .dropdown-menu:after {
   content: '';
@@ -1771,14 +1759,22 @@ i {
   border-bottom: 6px solid #fff;
   position: absolute;
   top: -6px;
-  left: 13px;
+  left: 10px;
 }
 .navbar .dropdown-toggle .caret, .navbar .open.dropdown .caret {
   border-top-color: #fff;
 }
-.navbar .open .dropdown-toggle {
+.navbar .nav .active .caret {
+  filter: alpha(opacity=100);
+  -moz-opacity: 1;
+  opacity: 1;
+}
+.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle {
   background-color: transparent;
 }
+.navbar .nav .active > .dropdown-toggle:hover {
+  color: #fff;
+}
 .navbar .nav.pull-right .dropdown-menu {
   right: 0;
 }

diff --git a/bootstrap.min.css b/bootstrap.min.css
index 2cbb4427e51a642bb28ffe993c578d5a3411cf9c..1723ca555edecdaf82c8e7c8f7cf0335f4276f4a 100644 (file)
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -301,9 +301,9 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .caret{display:inline-block;width:0;height:0;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000;filter:alpha(opacity=30);-moz-opacity:0.3;opacity:0.3;content:"\2193";}
 .dropdown .caret{margin-top:8px;margin-left:2px;}
 .dropdown:hover .caret,.open.dropdown .caret{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
-.dropdown-menu{position:absolute;top:40px;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:5px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#999;border-color:rgba(0, 0, 0, 0.1);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;zoom:1;}.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
-.dropdown-menu a{display:block;padding:2px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;}
-.dropdown-menu li>a:hover{color:#fff;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0077b3;background-image:-khtml-gradient(linear, left top, left bottom, from(#0088cc), to(#0077b3));background-image:-moz-linear-gradient(top, #0088cc, #0077b3);background-image:-ms-linear-gradient(top, #0088cc, #0077b3);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #0088cc), color-stop(100%, #0077b3));background-image:-webkit-linear-gradient(top, #0088cc, #0077b3);background-image:-o-linear-gradient(top, #0088cc, #0077b3);background-image:linear-gradient(top, #0088cc, #0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0077b3', GradientType=0);-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.075),inset 0 -1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.075),inset 0 -1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.075),inset 0 -1px rgba(0, 0, 0, 0.075);}
+.dropdown-menu{position:absolute;top:40px;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;zoom:1;}.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
+.dropdown-menu a{display:block;padding:2px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;white-space:nowrap;}
+.dropdown-menu li>a:hover{color:#fff;text-decoration:none;background-color:#0088cc;}
 .dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#fff;background-color:#999;background-image:none;}
 .dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
 .dropdown.open .dropdown-menu{display:block;}
@@ -334,10 +334,12 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .navbar .nav .active>a{color:#ffffff;text-decoration:none;background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
 .navbar .vertical-divider{height:40px;width:1px;margin:0 5px;overflow:hidden;background-color:#222;border-right:1px solid #444;}
 .navbar .nav.pull-right{margin-left:10px;margin-right:0;}
-.navbar .dropdown-menu{top:42px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.1);position:absolute;top:-7px;left:12px;}
-.navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;top:-6px;left:13px;}
+.navbar .dropdown-menu{top:41px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;}
+.navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;top:-6px;left:10px;}
 .navbar .dropdown-toggle .caret,.navbar .open.dropdown .caret{border-top-color:#fff;}
-.navbar .open .dropdown-toggle{background-color:transparent;}
+.navbar .nav .active .caret{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
+.navbar .nav .open>.dropdown-toggle,.navbar .nav .active>.dropdown-toggle,.navbar .nav .open.active>.dropdown-toggle{background-color:transparent;}
+.navbar .nav .active>.dropdown-toggle:hover{color:#fff;}
 .navbar .nav.pull-right .dropdown-menu{right:0;}.navbar .nav.pull-right .dropdown-menu:before{left:auto;right:12px;}
 .navbar .nav.pull-right .dropdown-menu:after{left:auto;right:13px;}
 .nav{margin-left:0;margin-bottom:18px;list-style:none;}

diff --git a/docs/base-css.html b/docs/base-css.html
index 29f5d1d197426715b121a69836dfaac20d9c59f9..7f60580b4aafaba54b9b8acaf3e918b9ee8514b6 100644 (file)
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -34,11 +34,71 @@
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
             <li><a href="./index.html">Overview</a></li>
-            <li><a href="./scaffolding.html">Scaffolding</a></li>
-            <li class="active"><a href="./base-css.html">Base CSS</a></li>
-            <li><a href="./components.html">Components</a></li>
-            <li><a href="./javascript.html">Javascript plugins</a></li>
-            <li><a href="./less.html">Using LESS</a></li>
+            <li class="dropdown">
+              <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
+                Scaffolding
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./scaffolding.html#grid">Grid system</a></li>
+                <li><a href="./scaffolding.html#layouts">Layouts</a></li>
+                <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
+              </ul>
+            </li>
+            <li class="dropdown active">
+              <a href="./base-css.html" class="dropdown-toggle" data-toggle="dropdown">
+                Base CSS
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./base-css.html#type">Type</a></li>
+                <li><a href="./base-css.html#tables">Tables</a></li>
+                <li><a href="./base-css.html#forms">Forms</a></li>
+                <li><a href="./base-css.html#buttons">Buttons</a></li>
+                <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a href="./components.html" class="dropdown-toggle" data-toggle="dropdown">
+                Components
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./components.html#buttonGroups">Button groups</a></li>
+                <li><a href="./components.html#buttonDropdowns">Split button dropdowns</a></li>
+                <li><a href="./components.html#navs">Nav, tabs, pills</a></li>
+                <li><a href="./components.html#navbar">Navbar</a></li>
+                <li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
+                <li><a href="./components.html#pagination">Pagination</a></li>
+                <li><a href="./components.html#thumbnails">Thumbnails</a></li>
+                <li><a href="./components.html#alerts">Alert messages</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a href="./javascript.html" class="dropdown-toggle" data-toggle="dropdown">
+                Javascript plugins
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./javascript.html#transition">Transition</a></li>
+                <li><a href="./javascript.html#modal">Modal</a></li>
+                <li><a href="./javascript.html#dropdown">Dropdown</a></li>
+                <li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
+                <li><a href="./javascript.html#tab">Tab</a></li>
+                <li><a href="./javascript.html#tooltip">Tooltip</a></li>
+                <li><a href="./javascript.html#popover">Popover</a></li>
+                <li><a href="./javascript.html#alerts">Alert</a></li>
+                <li><a href="./javascript.html#buttons">Button</a></li>
+                <li><a href="./javascript.html#collapse">Collapse</a></li>
+                <li><a href="./javascript.html#carousel">Carousel</a></li>
+                <li><a href="./javascript.html#typeahead">Typeahead</a></li>
+              </ul>
+            </li>
+            <li>
+              <a href="./less.html">
+                Using LESS
+              </a>
+            </li>
           </ul>
         </div>
       </div>

diff --git a/docs/components.html b/docs/components.html
index 873bbf6823561a66a0afda5bc08a2a39b018d98e..b9d75edbef80cfbab6697ba1adc242f63ce8d68f 100644 (file)
--- a/docs/components.html
+++ b/docs/components.html
@@ -34,11 +34,71 @@
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
             <li><a href="./index.html">Overview</a></li>
-            <li><a href="./scaffolding.html">Scaffolding</a></li>
-            <li><a href="./base-css.html">Base CSS</a></li>
-            <li class="active"><a href="./components.html">Components</a></li>
-            <li><a href="./javascript.html">Javascript plugins</a></li>
-            <li><a href="./less.html">Using LESS</a></li>
+            <li class="dropdown">
+              <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
+                Scaffolding
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./scaffolding.html#grid">Grid system</a></li>
+                <li><a href="./scaffolding.html#layouts">Layouts</a></li>
+                <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a href="./base-css.html" class="dropdown-toggle" data-toggle="dropdown">
+                Base CSS
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./base-css.html#type">Type</a></li>
+                <li><a href="./base-css.html#tables">Tables</a></li>
+                <li><a href="./base-css.html#forms">Forms</a></li>
+                <li><a href="./base-css.html#buttons">Buttons</a></li>
+                <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
+              </ul>
+            </li>
+            <li class="dropdown active">
+              <a href="./components.html" class="dropdown-toggle" data-toggle="dropdown">
+                Components
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./components.html#buttonGroups">Button groups</a></li>
+                <li><a href="./components.html#buttonDropdowns">Split button dropdowns</a></li>
+                <li><a href="./components.html#navs">Nav, tabs, pills</a></li>
+                <li><a href="./components.html#navbar">Navbar</a></li>
+                <li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
+                <li><a href="./components.html#pagination">Pagination</a></li>
+                <li><a href="./components.html#thumbnails">Thumbnails</a></li>
+                <li><a href="./components.html#alerts">Alert messages</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a href="./javascript.html" class="dropdown-toggle" data-toggle="dropdown">
+                Javascript plugins
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./javascript.html#transition">Transition</a></li>
+                <li><a href="./javascript.html#modal">Modal</a></li>
+                <li><a href="./javascript.html#dropdown">Dropdown</a></li>
+                <li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
+                <li><a href="./javascript.html#tab">Tab</a></li>
+                <li><a href="./javascript.html#tooltip">Tooltip</a></li>
+                <li><a href="./javascript.html#popover">Popover</a></li>
+                <li><a href="./javascript.html#alerts">Alert</a></li>
+                <li><a href="./javascript.html#buttons">Button</a></li>
+                <li><a href="./javascript.html#collapse">Collapse</a></li>
+                <li><a href="./javascript.html#carousel">Carousel</a></li>
+                <li><a href="./javascript.html#typeahead">Typeahead</a></li>
+              </ul>
+            </li>
+            <li>
+              <a href="./less.html">
+                Using LESS
+              </a>
+            </li>
           </ul>
         </div>
       </div>
@@ -127,7 +187,7 @@
 
   <!-- Split button dropdowns
   ================================================== -->
-  <section id="buttonGroups">
+  <section id="buttonDropdowns">
     <div class="page-header">
       <h1>Split button dropdowns <small>Built on button groups to provide contextual menus</small></h1>
     </div>

diff --git a/docs/index.html b/docs/index.html
index 8f7963afd229cd5cd216f54dbdcf2fe282387677..8d5448ce1dc5312f5898dc45cfe77ffc9c0f5106 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -35,11 +35,71 @@
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
             <li class="active"><a href="./index.html">Overview</a></li>
-            <li><a href="./scaffolding.html">Scaffolding</a></li>
-            <li><a href="./base-css.html">Base CSS</a></li>
-            <li><a href="./components.html">Components</a></li>
-            <li><a href="./javascript.html">Javascript plugins</a></li>
-            <li><a href="./less.html">Using LESS</a></li>
+            <li class="dropdown">
+              <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
+                Scaffolding
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./scaffolding.html#grid">Grid system</a></li>
+                <li><a href="./scaffolding.html#layouts">Layouts</a></li>
+                <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a href="./base-css.html" class="dropdown-toggle" data-toggle="dropdown">
+                Base CSS
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./base-css.html#type">Type</a></li>
+                <li><a href="./base-css.html#tables">Tables</a></li>
+                <li><a href="./base-css.html#forms">Forms</a></li>
+                <li><a href="./base-css.html#buttons">Buttons</a></li>
+                <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a href="./components.html" class="dropdown-toggle" data-toggle="dropdown">
+                Components
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./components.html#buttonGroups">Button groups</a></li>
+                <li><a href="./components.html#buttonDropdowns">Split button dropdowns</a></li>
+                <li><a href="./components.html#navs">Nav, tabs, pills</a></li>
+                <li><a href="./components.html#navbar">Navbar</a></li>
+                <li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
+                <li><a href="./components.html#pagination">Pagination</a></li>
+                <li><a href="./components.html#thumbnails">Thumbnails</a></li>
+                <li><a href="./components.html#alerts">Alert messages</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a href="./javascript.html" class="dropdown-toggle" data-toggle="dropdown">
+                Javascript plugins
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./javascript.html#transition">Transition</a></li>
+                <li><a href="./javascript.html#modal">Modal</a></li>
+                <li><a href="./javascript.html#dropdown">Dropdown</a></li>
+                <li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
+                <li><a href="./javascript.html#tab">Tab</a></li>
+                <li><a href="./javascript.html#tooltip">Tooltip</a></li>
+                <li><a href="./javascript.html#popover">Popover</a></li>
+                <li><a href="./javascript.html#alerts">Alert</a></li>
+                <li><a href="./javascript.html#buttons">Button</a></li>
+                <li><a href="./javascript.html#collapse">Collapse</a></li>
+                <li><a href="./javascript.html#carousel">Carousel</a></li>
+                <li><a href="./javascript.html#typeahead">Typeahead</a></li>
+              </ul>
+            </li>
+            <li>
+              <a href="./less.html">
+                Using LESS
+              </a>
+            </li>
           </ul>
         </div>
       </div>
@@ -253,5 +313,6 @@
     <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
     <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
     <script src="assets/js/application.js"></script>
+    <script src="../js/bootstrap-dropdown.js"></script>
   </body>
 </html>

diff --git a/docs/javascript.html b/docs/javascript.html
index 0350103fab0265b46d660acb822fe174791f2c62..216bcdef5aa3935e30138288ac037353389d16f0 100644 (file)
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -35,11 +35,71 @@
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
             <li><a href="./index.html">Overview</a></li>
-            <li><a href="./scaffolding.html">Scaffolding</a></li>
-            <li><a href="./base-css.html">Base CSS</a></li>
-            <li><a href="./components.html">Components</a></li>
-            <li class="active"><a href="./javascript.html">Javascript plugins</a></li>
-            <li><a href="./less.html">Using LESS</a></li>
+            <li class="dropdown">
+              <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
+                Scaffolding
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./scaffolding.html#grid">Grid system</a></li>
+                <li><a href="./scaffolding.html#layouts">Layouts</a></li>
+                <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a href="./base-css.html" class="dropdown-toggle" data-toggle="dropdown">
+                Base CSS
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./base-css.html#type">Type</a></li>
+                <li><a href="./base-css.html#tables">Tables</a></li>
+                <li><a href="./base-css.html#forms">Forms</a></li>
+                <li><a href="./base-css.html#buttons">Buttons</a></li>
+                <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a href="./components.html" class="dropdown-toggle" data-toggle="dropdown">
+                Components
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./components.html#buttonGroups">Button groups</a></li>
+                <li><a href="./components.html#buttonDropdowns">Split button dropdowns</a></li>
+                <li><a href="./components.html#navs">Nav, tabs, pills</a></li>
+                <li><a href="./components.html#navbar">Navbar</a></li>
+                <li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
+                <li><a href="./components.html#pagination">Pagination</a></li>
+                <li><a href="./components.html#thumbnails">Thumbnails</a></li>
+                <li><a href="./components.html#alerts">Alert messages</a></li>
+              </ul>
+            </li>
+            <li class="dropdown active">
+              <a href="./javascript.html" class="dropdown-toggle" data-toggle="dropdown">
+                Javascript plugins
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./javascript.html#transition">Transition</a></li>
+                <li><a href="./javascript.html#modal">Modal</a></li>
+                <li><a href="./javascript.html#dropdown">Dropdown</a></li>
+                <li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
+                <li><a href="./javascript.html#tab">Tab</a></li>
+                <li><a href="./javascript.html#tooltip">Tooltip</a></li>
+                <li><a href="./javascript.html#popover">Popover</a></li>
+                <li><a href="./javascript.html#alerts">Alert</a></li>
+                <li><a href="./javascript.html#buttons">Button</a></li>
+                <li><a href="./javascript.html#collapse">Collapse</a></li>
+                <li><a href="./javascript.html#carousel">Carousel</a></li>
+                <li><a href="./javascript.html#typeahead">Typeahead</a></li>
+              </ul>
+            </li>
+            <li>
+              <a href="./less.html">
+                Using LESS
+              </a>
+            </li>
           </ul>
         </div>
       </div>

diff --git a/docs/less.html b/docs/less.html
index 05398e96655f692133353c9604cf309da15afd7b..cecf22da403a6491f6d0bd4ddba3b6b7b51ce452 100644 (file)
--- a/docs/less.html
+++ b/docs/less.html
@@ -34,11 +34,71 @@
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
             <li><a href="./index.html">Overview</a></li>
-            <li><a href="./scaffolding.html">Scaffolding</a></li>
-            <li><a href="./base-css.html">Base CSS</a></li>
-            <li><a href="./components.html">Components</a></li>
-            <li><a href="./javascript.html">Javascript plugins</a></li>
-            <li class="active"><a href="./less.html">Using LESS</a></li>
+            <li class="dropdown">
+              <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
+                Scaffolding
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./scaffolding.html#grid">Grid system</a></li>
+                <li><a href="./scaffolding.html#layouts">Layouts</a></li>
+                <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a href="./base-css.html" class="dropdown-toggle" data-toggle="dropdown">
+                Base CSS
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./base-css.html#type">Type</a></li>
+                <li><a href="./base-css.html#tables">Tables</a></li>
+                <li><a href="./base-css.html#forms">Forms</a></li>
+                <li><a href="./base-css.html#buttons">Buttons</a></li>
+                <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a href="./components.html" class="dropdown-toggle" data-toggle="dropdown">
+                Components
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./components.html#buttonGroups">Button groups</a></li>
+                <li><a href="./components.html#buttonDropdowns">Split button dropdowns</a></li>
+                <li><a href="./components.html#navs">Nav, tabs, pills</a></li>
+                <li><a href="./components.html#navbar">Navbar</a></li>
+                <li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
+                <li><a href="./components.html#pagination">Pagination</a></li>
+                <li><a href="./components.html#thumbnails">Thumbnails</a></li>
+                <li><a href="./components.html#alerts">Alert messages</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a href="./javascript.html" class="dropdown-toggle" data-toggle="dropdown">
+                Javascript plugins
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./javascript.html#transition">Transition</a></li>
+                <li><a href="./javascript.html#modal">Modal</a></li>
+                <li><a href="./javascript.html#dropdown">Dropdown</a></li>
+                <li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
+                <li><a href="./javascript.html#tab">Tab</a></li>
+                <li><a href="./javascript.html#tooltip">Tooltip</a></li>
+                <li><a href="./javascript.html#popover">Popover</a></li>
+                <li><a href="./javascript.html#alerts">Alert</a></li>
+                <li><a href="./javascript.html#buttons">Button</a></li>
+                <li><a href="./javascript.html#collapse">Collapse</a></li>
+                <li><a href="./javascript.html#carousel">Carousel</a></li>
+                <li><a href="./javascript.html#typeahead">Typeahead</a></li>
+              </ul>
+            </li>
+            <li class="active">
+              <a href="./less.html">
+                Using LESS
+              </a>
+            </li>
           </ul>
         </div>
       </div>

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index b868fd215c968caa4ea788ff1bac956c1ef96362..546a2755ad73f6023539008ca6e989fedd5eb5a9 100644 (file)
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -34,11 +34,71 @@
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
             <li><a href="./index.html">Overview</a></li>
-            <li class="active"><a href="./scaffolding.html">Scaffolding</a></li>
-            <li><a href="./base-css.html">Base CSS</a></li>
-            <li><a href="./components.html">Components</a></li>
-            <li><a href="./javascript.html">Javascript plugins</a></li>
-            <li><a href="./less.html">Using LESS</a></li>
+            <li class="dropdown active">
+              <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
+                Scaffolding
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./scaffolding.html#grid">Grid system</a></li>
+                <li><a href="./scaffolding.html#layouts">Layouts</a></li>
+                <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a href="./base-css.html" class="dropdown-toggle" data-toggle="dropdown">
+                Base CSS
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./base-css.html#type">Type</a></li>
+                <li><a href="./base-css.html#tables">Tables</a></li>
+                <li><a href="./base-css.html#forms">Forms</a></li>
+                <li><a href="./base-css.html#buttons">Buttons</a></li>
+                <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a href="./components.html" class="dropdown-toggle" data-toggle="dropdown">
+                Components
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./components.html#buttonGroups">Button groups</a></li>
+                <li><a href="./components.html#buttonDropdowns">Split button dropdowns</a></li>
+                <li><a href="./components.html#navs">Nav, tabs, pills</a></li>
+                <li><a href="./components.html#navbar">Navbar</a></li>
+                <li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
+                <li><a href="./components.html#pagination">Pagination</a></li>
+                <li><a href="./components.html#thumbnails">Thumbnails</a></li>
+                <li><a href="./components.html#alerts">Alert messages</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a href="./javascript.html" class="dropdown-toggle" data-toggle="dropdown">
+                Javascript plugins
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./javascript.html#transition">Transition</a></li>
+                <li><a href="./javascript.html#modal">Modal</a></li>
+                <li><a href="./javascript.html#dropdown">Dropdown</a></li>
+                <li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
+                <li><a href="./javascript.html#tab">Tab</a></li>
+                <li><a href="./javascript.html#tooltip">Tooltip</a></li>
+                <li><a href="./javascript.html#popover">Popover</a></li>
+                <li><a href="./javascript.html#alerts">Alert</a></li>
+                <li><a href="./javascript.html#buttons">Button</a></li>
+                <li><a href="./javascript.html#collapse">Collapse</a></li>
+                <li><a href="./javascript.html#carousel">Carousel</a></li>
+                <li><a href="./javascript.html#typeahead">Typeahead</a></li>
+              </ul>
+            </li>
+            <li>
+              <a href="./less.html">
+                Using LESS
+              </a>
+            </li>
           </ul>
         </div>
       </div>
@@ -361,66 +421,6 @@
       <!-- Footer
       ================================================== -->
       <footer class="footer">
-        <div class="row">
-          <dl class="span2">
-            <dt>Bootstrap</dt>
-            <dd><a href="./index.html">Overview</a></dd>
-            <dd><a href="./index.html#gettingstarted">Getting started</a></dd>
-            <dt>Elsewhere</dt>
-            <dd><a href="https://github.com/twitter/bootstrap/">GitHub</a></dd>
-            <dd><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></dd>
-            <dd><a href="https://github.com/twitter/bootstrap/wiki/Roadmap">Roadmap</a></dd>
-            <dd><a href="https://github.com/twitter/bootstrap/wiki/Changelog">Changelog</a></dd>
-          </dl>
-          <dl class="span2">
-            <dt>Scaffolding</dt>
-            <dd><a href="./scaffolding.html#grid">Grid system</a></dd>
-            <dd><a href="./scaffolding.html#layouts">Layouts</a></dd>
-            <dd><a href="./scaffolding.html#responsive">Responsive design</a></dd>
-          </dl>
-          <dl class="span2">
-            <dt>Base CSS</dt>
-            <dd><a href="./base-css.html#type">Type</a></dd>
-            <dd><a href="./base-css.html#tables">Tables</a></dd>
-            <dd><a href="./base-css.html#forms">Forms</a></dd>
-            <dd><a href="./base-css.html#buttons">Buttons</a></dd>
-            <dd><a href="./base-css.html#icons">Icons by Glyphicons</a></dd>
-          </dl>
-          <dl class="span2">
-            <dt>Components</dt>
-            <dd><a href="./base-css.html#buttonGroups">Button groups</a></dd>
-            <dd><a href="./base-css.html#buttonDropdowns">Split button dropdowns</a></dd>
-            <dd><a href="./components.html#navs">Nav, tabs, pills</a></dd>
-            <dd><a href="./components.html#navbar">Navbar</a></dd>
-            <dd><a href="./components.html#breadcrumbs">Breadcrumbs</a></dd>
-            <dd><a href="./components.html#pagination">Pagination</a></dd>
-            <dd><a href="./components.html#thumbnails">Thumbnails</a></dd>
-            <dd><a href="./components.html#alerts">Alert messages</a></dd>
-          </dl>
-          <dl class="span2">
-            <dt>Javascript plugins</dt>
-            <dd><a href="./javascript.html#transition">Transition</a></dd>
-            <dd><a href="./javascript.html#modal">Modal</a></dd>
-            <dd><a href="./javascript.html#dropdown">Dropdown</a></dd>
-            <dd><a href="./javascript.html#scrollspy">Scrollspy</a></dd>
-            <dd><a href="./javascript.html#tab">Tab</a></dd>
-            <dd><a href="./javascript.html#tooltip">Tooltip</a></dd>
-            <dd><a href="./javascript.html#popover">Popover</a></dd>
-            <dd><a href="./javascript.html#alerts">Alert</a></dd>
-            <dd><a href="./javascript.html#buttons">Button</a></dd>
-            <dd><a href="./javascript.html#collapse">Collapse</a></dd>
-            <dd><a href="./javascript.html#carousel">Carousel</a></dd>
-            <dd><a href="./javascript.html#typeahead">Typeahead</a></dd>
-          </dl>
-          <dl class="span2">
-            <dt>Using LESS</dt>
-            <dd><a href="./less.html#intro">Introduction to LESS</a></dd>
-            <dd><a href="./less.html#variables">Variables</a></dd>
-            <dd><a href="./less.html#mixins">Mixins</a></dd>
-            <dd><a href="./less.html#compiling">Compiling Bootstrap</a></dd>
-          </dl>
-        </div>
-        <hr>
         <p class="pull-right"><a href="#">Back to top</a></p>
         <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
         <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>

diff --git a/docs/upgrading.html b/docs/upgrading.html
index 916240794f0cfb7297f273c683db0ae790181cc9..d91bf20af8b57be7ae58b825df66a9d46f7f6dc2 100644 (file)
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -34,11 +34,71 @@
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
             <li><a href="./index.html">Overview</a></li>
-            <li><a href="./scaffolding.html">Scaffolding</a></li>
-            <li><a href="./base-css.html">Base CSS</a></li>
-            <li><a href="./components.html">Components</a></li>
-            <li><a href="./javascript.html">Javascript plugins</a></li>
-            <li><a href="./less.html">Using LESS</a></li>
+            <li class="dropdown">
+              <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
+                Scaffolding
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./scaffolding.html#grid">Grid system</a></li>
+                <li><a href="./scaffolding.html#layouts">Layouts</a></li>
+                <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a href="./base-css.html" class="dropdown-toggle" data-toggle="dropdown">
+                Base CSS
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./base-css.html#type">Type</a></li>
+                <li><a href="./base-css.html#tables">Tables</a></li>
+                <li><a href="./base-css.html#forms">Forms</a></li>
+                <li><a href="./base-css.html#buttons">Buttons</a></li>
+                <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a href="./components.html" class="dropdown-toggle" data-toggle="dropdown">
+                Components
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./components.html#buttonGroups">Button groups</a></li>
+                <li><a href="./components.html#buttonDropdowns">Split button dropdowns</a></li>
+                <li><a href="./components.html#navs">Nav, tabs, pills</a></li>
+                <li><a href="./components.html#navbar">Navbar</a></li>
+                <li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
+                <li><a href="./components.html#pagination">Pagination</a></li>
+                <li><a href="./components.html#thumbnails">Thumbnails</a></li>
+                <li><a href="./components.html#alerts">Alert messages</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a href="./javascript.html" class="dropdown-toggle" data-toggle="dropdown">
+                Javascript plugins
+                <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="./javascript.html#transition">Transition</a></li>
+                <li><a href="./javascript.html#modal">Modal</a></li>
+                <li><a href="./javascript.html#dropdown">Dropdown</a></li>
+                <li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
+                <li><a href="./javascript.html#tab">Tab</a></li>
+                <li><a href="./javascript.html#tooltip">Tooltip</a></li>
+                <li><a href="./javascript.html#popover">Popover</a></li>
+                <li><a href="./javascript.html#alerts">Alert</a></li>
+                <li><a href="./javascript.html#buttons">Button</a></li>
+                <li><a href="./javascript.html#collapse">Collapse</a></li>
+                <li><a href="./javascript.html#carousel">Carousel</a></li>
+                <li><a href="./javascript.html#typeahead">Typeahead</a></li>
+              </ul>
+            </li>
+            <li>
+              <a href="./less.html">
+                Using LESS
+              </a>
+            </li>
           </ul>
         </div>
       </div>

diff --git a/lib/dropdowns.less b/lib/dropdowns.less
index 85f74b6322ee6dceff68c14fef1567abdfa9635f..daa7003e31045bc63af5eb4d3c6d6381e65e6f23 100644 (file)
--- a/lib/dropdowns.less
+++ b/lib/dropdowns.less
@@ -36,12 +36,12 @@
   min-width: 160px;
   max-width: 220px;
   _width: 160px;
-  padding: 5px 0;
+  padding: 4px 0;
   margin: 0; // override default ul
   list-style: none;
   background-color: @white;
   border-color: #999;
-  border-color: rgba(0,0,0,.1);
+  border-color: rgba(0,0,0,.2);
   border-style: solid;
   border-width: 1px;
   .border-radius(0 0 5px 5px);
@@ -68,6 +68,7 @@
     font-weight: normal;
     line-height: 18px;
     color: @gray;
+    white-space: nowrap;
   }
 }
 
@@ -75,10 +76,7 @@
 .dropdown-menu li > a:hover {
   color: #fff;
   text-decoration: none;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-  #gradient > .vertical(@linkColor, darken(@linkColor, 5%));
-  @shadow: inset 0 1px 0 rgba(0,0,0,.075), inset 0 -1px rgba(0,0,0,.075);
-  .box-shadow(@shadow);
+  background-color: @linkColor;
 }
 
 // Active state

diff --git a/lib/navbar.less b/lib/navbar.less
index 82f9f7d2e4fb1d2af723a74fe14c9789fbf7a2a9..a3e64cde869ff4e5a23d7e06f0239ae438e1fcf4 100644 (file)
--- a/lib/navbar.less
+++ b/lib/navbar.less
@@ -192,7 +192,7 @@
 
 // Menu position and menu carets
 .navbar .dropdown-menu {
-  top: 42px;
+  top: 41px;
   .border-radius(4px);
   &:before {
     content: '';
@@ -200,10 +200,10 @@
     border-left:   7px solid transparent;
     border-right:  7px solid transparent;
     border-bottom: 7px solid #ccc;
-    border-bottom-color: rgba(0,0,0,.1);
+    border-bottom-color: rgba(0,0,0,.2);
     position: absolute;
     top: -7px;
-    left: 12px;
+    left: 9px;
   }
   &:after {
     content: '';
@@ -213,7 +213,7 @@
     border-bottom: 6px solid #fff;
     position: absolute;
     top: -6px;
-    left: 13px;
+    left: 10px;
   }
 }
 
@@ -222,12 +222,22 @@
 .navbar .open.dropdown .caret {
   border-top-color: #fff;
 }
+.navbar .nav .active .caret {
+  .opacity(100);
+}
 
 // Remove background color from open dropdown
-.navbar .open .dropdown-toggle {
+.navbar .nav .open > .dropdown-toggle,
+.navbar .nav .active > .dropdown-toggle,
+.navbar .nav .open.active > .dropdown-toggle {
   background-color: transparent;
 }
 
+// Dropdown link on hover
+.navbar .nav .active > .dropdown-toggle:hover {
+  color: #fff;
+}
+
 // Right aligned menus need alt position
 .navbar .nav.pull-right .dropdown-menu {
   right: 0;