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

7 files changed, 227 insertions, 52 deletions

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 416b1830c..69d9dac56 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -115,8 +115,8 @@ section {
 ------------------------- */
 /* supporting docs pages */
 .subhead {
-  padding-bottom: 14px;
-  border-bottom: 3px solid #e5e5e5;
+  padding-bottom: 0;
+  border-bottom: 0;
 }
 .subhead h1,
 .subhead p {
@@ -126,6 +126,36 @@ section {
   font-size: 45px;
 }
 
+/* Subnav */
+.subhead .nav {
+  padding: 0 10px;
+  background-color: #eeeeee; /* Old browsers */
+  background-repeat: repeat-x; /* Repeat the gradient */
+  background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#eeeeee)); /* Chrome,Safari4+ */
+  background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Chrome 10+,Safari 5.1+ */
+  background-image: -ms-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* IE10+ */
+  background-image: -o-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Opera 11.10+ */
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */
+  background-image: linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* W3C */
+  border: 1px solid #eee;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+.subhead .nav a {
+  margin: 0;
+  padding-top: 11px;
+  padding-bottom: 11px;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+.subhead .nav .active a {
+  background-color: #fff;
+  color: #333;
+}
+
 
 /* Quick links
 -------------------------------------------------- */
@@ -418,6 +448,7 @@ h2 + .row {
   margin: -18px 0 27px;
   font-size: 18px;
   font-weight: 300;
+  line-height: 24px;
   color: #999;
   text-align: center;
 }
@@ -533,6 +564,18 @@ form.well {
     margin: 0 auto 10px;
   }
 
+  /* Subnav */
+  .subhead .nav {
+    padding: 0;
+    background: none;
+  }
+  .subhead .nav > li {
+    float: none;
+  }
+  .subhead .nav li + li a {
+    border-top: 1px solid #eee;
+  }
+
   /* Don't space out quick links so much */
   .quick-links {
     margin: 40px 0 0;
diff --git a/docs/base-css.html b/docs/base-css.html
index a3e8cc85a..a869eecf8 100644
--- a/docs/base-css.html
+++ b/docs/base-css.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">
@@ -45,20 +46,16 @@
                 <li><a href="./scaffolding.html#layouts">Layouts</a></li>
                 <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
               </ul>
+=======
+            <li><a href="./index.html">Overview</a></li>
+            <li>
+              <a href="./scaffolding.html">Scaffolding</a>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
             </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#typography">Typography</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 class="active">
+              <a href="./base-css.html">Base CSS</a>
             </li>
+<<<<<<< HEAD
             <li class="dropdown ">
               <a href="./components.html" class="dropdown-toggle" data-toggle="dropdown">
                 Components
@@ -100,6 +97,16 @@
               <a href="./less.html">
                 Using LESS
               </a>
+=======
+            <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>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
             </li>
           </ul>
         </div>
@@ -108,12 +115,28 @@
 
     <div class="container">
 
+<<<<<<< HEAD
 <!-- Masthead
 ================================================== -->
 <header class="jumbotron subhead" id="overview">
   <h1>Base CSS</h1>
   <p class="lead">On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.</p>
 </header>
+=======
+      <!-- Masthead
+      ================================================== -->
+      <header class="jumbotron subhead" id="overview">
+        <h1>Base CSS</h1>
+        <p class="lead">On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.</p>
+        <ul class="nav pills">
+          <li><a href="./base-css.html#typography">Typography</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>
+      </header>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
 
 
 <!-- Typography
diff --git a/docs/components.html b/docs/components.html
index ea58cecb8..ee14526e5 100644
--- a/docs/components.html
+++ b/docs/components.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">
@@ -58,24 +59,19 @@
                 <li><a href="./base-css.html#buttons">Buttons</a></li>
                 <li><a href="./base-css.html#icons">Icons by Glyphicons</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="./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>
-                <li><a href="./components.html#progress">Progress bars</a></li>
-              </ul>
+            <li>
+              <a href="./base-css.html">Base CSS</a>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
+            </li>
+            <li class="active">
+              <a href="./components.html">Components</a>
             </li>
+<<<<<<< HEAD
             <li class="dropdown ">
               <a href="./javascript.html" class="dropdown-toggle" data-toggle="dropdown">
                 Javascript plugins
@@ -100,6 +96,13 @@
               <a href="./less.html">
                 Using LESS
               </a>
+=======
+            <li>
+              <a href="./javascript.html">Javascript plugins</a>
+            </li>
+            <li>
+              <a href="./less.html">Using LESS</a>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
             </li>
           </ul>
         </div>
@@ -108,12 +111,33 @@
 
     <div class="container">
 
+<<<<<<< HEAD
 <!-- Masthead
 ================================================== -->
 <header class="jumbotron subhead" id="overview">
   <h1>Components</h1>
   <p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p>
 </header>
+=======
+      <!-- Masthead
+      ================================================== -->
+      <header class="jumbotron subhead" id="overview">
+        <h1>Components</h1>
+        <p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p>
+        <ul class="nav pills">
+          <li><a href="./components.html#buttonGroups">Button groups</a></li>
+          <li><a href="./components.html#buttonDropdowns">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">Alerts</a></li>
+          <li><a href="./components.html#progress">Progress bars</a></li>
+        </ul>
+      </header>
+
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
 
 
   <!-- Button Groups
diff --git a/docs/index.html b/docs/index.html
index 1e0ff52f6..f61518e07 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -35,6 +35,7 @@
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
             <li class="active"><a href="./index.html">Overview</a></li>
+<<<<<<< HEAD
             <li class="dropdown ">
               <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
                 Scaffolding
@@ -100,6 +101,22 @@
               <a href="./less.html">
                 Using LESS
               </a>
+=======
+            <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>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
             </li>
           </ul>
         </div>
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
 ================================================== -->
diff --git a/docs/less.html b/docs/less.html
index 84f58f00d..5c8eb735d 100644
--- a/docs/less.html
+++ b/docs/less.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">
@@ -95,11 +96,23 @@
                 <li><a href="./javascript.html#carousel">Carousel</a></li>
                 <li><a href="./javascript.html#typeahead">Typeahead</a></li>
               </ul>
+=======
+            <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>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
             </li>
             <li class="active">
-              <a href="./less.html">
-                Using LESS
-              </a>
+              <a href="./less.html">Using LESS</a>
             </li>
           </ul>
         </div>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 7fdbea0ec..904d53af6 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.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 active">
               <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
@@ -100,6 +101,23 @@
               <a href="./less.html">
                 Using LESS
               </a>
+=======
+            <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>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
             </li>
           </ul>
         </div>
@@ -108,6 +126,7 @@
 
     <div class="container">
 
+<<<<<<< HEAD
 
 <!-- Masthead
 ================================================== -->
@@ -115,6 +134,19 @@
   <h1>Scaffolding</h1>
   <p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p>
 </header>
+=======
+      <!-- Masthead
+      ================================================== -->
+      <header class="jumbotron subhead" id="overview">
+        <h1>Scaffolding</h1>
+        <p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p>
+        <ul class="nav pills">
+          <li><a href="./scaffolding.html#grid-system">Grid system</a></li>
+          <li><a href="./scaffolding.html#layouts">Layouts</a></li>
+          <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
+        </ul>
+      </header>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2