Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
	bootstrap.css
	docs/base-css.html
	docs/components.html
	docs/index.html
	docs/javascript.html
	docs/less.html
	docs/scaffolding.html

1 files changed, 42 insertions, 19 deletions

diff --git a/docs/javascript.html b/docs/javascript.html
index fda3ae32b..ac933b9cf 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -34,6 +34,7 @@
         <div class="container">
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
+<<<<<<< HEAD
             <li class=""><a href="./index.html">Overview</a></li>
             <li class="dropdown ">
               <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
@@ -75,31 +76,30 @@
                 <li><a href="./components.html#alerts">Alert messages</a></li>
                 <li><a href="./components.html#progress">Progress bars</a></li>
               </ul>
+=======
+            <li><a href="./index.html">Overview</a></li>
+            <li>
+              <a href="./scaffolding.html">Scaffolding</a>
             </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#javascript">Overview</a></li>
-                <li><a href="./javascript.html#modals">Modal</a></li>
-                <li><a href="./javascript.html#dropdowns">Dropdown</a></li>
-                <li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
-                <li><a href="./javascript.html#tabs">Tab</a></li>
-                <li><a href="./javascript.html#tooltips">Tooltip</a></li>
-                <li><a href="./javascript.html#popovers">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>
+              <a href="./base-css.html">Base CSS</a>
             </li>
+            <li>
+              <a href="./components.html">Components</a>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
+            </li>
+            <li class="active">
+              <a href="./javascript.html">Javascript plugins</a>
+            </li>
+<<<<<<< HEAD
             <li class="">
               <a href="./less.html">
                 Using LESS
               </a>
+=======
+            <li>
+              <a href="./less.html">Using LESS</a>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
             </li>
           </ul>
         </div>
@@ -107,6 +107,29 @@
     </div>
 
     <div class="container">
+<<<<<<< HEAD
+=======
+      <!-- Masthead
+      ================================================== -->
+      <header class="jumbotron subhead" id="overview">
+        <h1>Javascript for Bootstrap</h1>
+        <p class="lead">Bring Bootstrap's components to life&mdash;now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.
+        <ul class="nav pills">
+          <li><a href="./javascript.html#javascript">Overview</a></li>
+          <li><a href="./javascript.html#modals">Modal</a></li>
+          <li><a href="./javascript.html#dropdowns">Dropdown</a></li>
+          <li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
+          <li><a href="./javascript.html#tabs">Tab</a></li>
+          <li><a href="./javascript.html#tooltips">Tooltip</a></li>
+          <li><a href="./javascript.html#popovers">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>
+      </header>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
 
 <!-- Masthead
 ================================================== -->