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

Conflicts:
	bootstrap.css

7 files changed, 92 insertions, 144 deletions

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 0873d443f..a7b52821e 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -39,45 +39,6 @@ body > .navbar-fixed .brand:hover {
 }
 
 
-/* Github buttons
--------------------------------------------------- */
-.github-btn + .github-btn {
-  margin-left: 10px;
-}
-.github-btn {
-  display: inline-block;
-  height: 20px;
-  overflow: hidden;
-}
-.github-btn .btn,
-.github-btn .count {
-  float: left;
-  padding: 1px 5px 1px 4px;
-  font-size: 11px;
-  font-weight: bold;
-  line-height: 16px;
-  color: #666;
-  text-shadow: 0 1px 0 #fff;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-}
-.github-btn .btn {
-  box-shadow: none;
-}
-.github-btn .github-ico {
-  float: left;
-  margin-right: 4px;
-  opacity: .65;
-}
-.github-btn .count {
-  display: inline-block;
-  margin-left: 2px;
-  background-color: #fff;
-  border: 1px solid #ddd;
-}
-
-
 /* Jumbotrons
 -------------------------------------------------- */
 .jumbotron {
@@ -304,13 +265,6 @@ body > .navbar-fixed .brand:hover {
   margin-left: 10px;
 }
 
-/* scrollspy docs */
-
-.scrollspy-example {
-  overflow: auto;
-  height: 200px;
-  position: relative;
-}
 
 /* Popover docs
 -------------------------------------------------- */
@@ -473,19 +427,3 @@ h2 + table {
   }
 }
 
-#accordion dt a{
-  display:block;
-  padding: 9px 15px;
-  line-height: 1;
-  background-color: whiteSmoke;
-  border: 1px solid #EEE;
-  border-top-color: #fff;
-}
-
-#accordion dt:first-child a {
-  border-top-color:#eee;
-}
-
-#accordion dd p {
-  padding: 10px;
-}
\ No newline at end of file
diff --git a/docs/base-css.html b/docs/base-css.html
index 11346b5b0..2b7d17b4a 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -50,7 +50,7 @@
       ================================================== -->
       <header class="jumbotron subhead" id="overview">
         <h1>Base CSS</h1>
-        <p class="lead">The core typography, form, and table styles of Bootstrap</p>
+        <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>
 
 
@@ -519,7 +519,7 @@
 
   <h2>Table options</h2>
   <table class="bordered-table striped-table">
-    <thead>
+  <thead>
       <tr>
         <th>Name</th>
         <th>Class</th>
@@ -551,7 +551,7 @@
         <td>
           <code>.condensed-table</code>
         </td>
-        <td>Cuts padding in half, from 10px to 5px, within all <code>td</code> and <code>th</code> elements</td>
+        <td>Cuts vertical padding in half, from 8px to 4px, within all <code>td</code> and <code>th</code> elements</td>
       </tr>
     </tbody>
   </table>
@@ -630,7 +630,49 @@
 &lt;table class="striped-table"&gt;
   ...
 &lt;/table&gt;</pre>
-  <h3>3. Condensed table</h3>
+  <h3>3. Bordered table</h3>
+  <p>Add borders around the entire table and between each row, plus a bit of rounded corners for aesthetic purposes.</p>
+  <p><span class="label">Note</span> Bordered tables do not work well with <code>rowspan</code> due to somewhat hacky CSS applied to the tables. Sorry about that!</p>
+  <table class="bordered-table">
+    <thead>
+      <tr>
+        <th>#</th>
+        <th>First Name</th>
+        <th>Last Name</th>
+        <th>Language</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>1</td>
+        <td colspan="2">Some One</td>
+        <td>English</td>
+      </tr>
+      <tr>
+        <td>2</td>
+        <td>Joe</td>
+        <td>Sixpack</td>
+        <td>English</td>
+      </tr>
+      </tr>
+        <td>Joe</td>
+        <td>Sixpack</td>
+        <td>English</td>
+      </tr>
+      <tr>
+        <td>3</td>
+        <td>Stu</td>
+        <td>Dent</td>
+        <td>Code</td>
+      </tr>
+    </tbody>
+  </table>
+  <p><strong>Note:</strong> Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.</p>
+<pre class="prettyprint linenums">
+&lt;table class="striped-table"&gt;
+  ...
+&lt;/table&gt;</pre>
+  <h3>4. Condensed table</h3>
   <p>Make your tables more compact by adding the <code>.condensed-table</code> class to cut table cell padding in half (from 10px to 5px).</p>
   <table class="condensed-table">
     <thead>
@@ -666,7 +708,7 @@
 &lt;table class="condensed-table"&gt;
   ...
 &lt;/table&gt;</pre>
-  <h3>4. Striped table w/ TableSorter.js</h3>
+  <h3>5. Striped table w/ TableSorter.js</h3>
   <p>Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via <a href="http://jquery.com">jQuery</a> and the <a href="http://tablesorter.com/docs/">Tablesorter</a> plugin. <strong>Click any column’s header to change the sort.</strong></p>
   <table class="striped-table" id="sortTableExample">
     <thead>
diff --git a/docs/components.html b/docs/components.html
index bb2f326b4..833f532d9 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -50,7 +50,7 @@
       ================================================== -->
       <header class="jumbotron subhead" id="overview">
         <h1>Components</h1>
-        <p class="lead">Reusable patterns for navigation, alerts, popovers, and much more</p>
+        <p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p>
       </header>
 
 
@@ -412,6 +412,28 @@
     </div>
   </div>
 
+  <!-- Step nav -->
+  <div class="row">
+    <div class="span3">
+      <h2>Step nav</h2>
+      <p>Placeholder for now!</p>
+    </div>
+    <div class="span9">
+      <br>
+      <ul class="step-nav">
+        <li class="prev"><a href="#">&laquo; Overview</a></li>
+        <li class="active"><a class="dot" href="#">1</a></li>
+        <li><a class="dot" href="#">2</a></li>
+        <li><a class="dot" href="#">3</a></li>
+        <li><a class="dot" href="#">4</a></li>
+        <li><a class="dot" href="#">5</a></li>
+        <li class="next"><a href="#">Base CSS &raquo;</a></li>
+      </ul>
+      <br>
+      <br>
+    </div>
+  </div>
+
   <!-- Pagination -->
   <div class="row">
     <div class="span3">
diff --git a/docs/index.html b/docs/index.html
index 051778741..ff7d56976 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -55,7 +55,8 @@
             <h1>Bootstrap,<br> from Twitter</h1>
             <p class="lead">Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, complete with core HTML, CSS, and JS for grids, type, forms, navigation, and many more components.</p>
             <p class="download-info">
-              <a href="#" class="btn primary btn-large">Download on GitHub</a>
+              <a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">Download on GitHub</a>
+              <a href="./scaffolding.html" class="btn btn-large">Get started</a>
               Currently v2.0.0
             </p>
 
@@ -82,22 +83,11 @@
           <li><a href="https://github.com/twitter/bootstrap/wiki/Changelog">Changelog</a></li>
           <li class="divider">&middot;</li>
           <li>
-            <span class="github-btn github-watchers">
-              <a href="https://github.com/twitter/bootstrap" class="btn">
-                <img class="github-ico" src="assets/img/github-16px.png">
-                Watch
-              </a>
-              <span class="count"></span>
-            </span>
-            <span class="github-btn github-forks">
-              <a href="https://github.com/twitter/bootstrap" class="btn">
-                <img class="github-ico" src="assets/img/github-16px.png">
-                Fork
-              </a>
-              <span class="count"></span>
-            </span>
+            <iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="110px" height="20px"></iframe>
+          </li>
+          <li>
+            <iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="94px" height="20px"></iframe>
           </li>
-
 <!--
           <li><strong>Authors</strong></li>
           <li><a href="http://twitter.com/mdo">@mdo</a></li>
@@ -190,23 +180,6 @@
           </div><!--/row-->
         </div>
 
-
-
-
-<!--         <h3>Quick-start examples</h3>
-        <p>Need some quick templates? Check out these basic examples we've put together:</p>
-        <ul class="media-grid">
-          <li>
-            <a href="../examples/hero.html"><img src="assets/img/example-diagram-01.png" alt="Simple three-column layout with hero unit"></a>
-          </li>
-          <li>
-            <a href="../examples/fluid.html"><img src="assets/img/example-diagram-02.png" alt="Fluid layout with static sidebar"></a>
-          </li>
-          <li>
-            <a href="../examples/container-app.html"><img src="assets/img/example-diagram-03.png" alt="Simple hanging container for apps"></a>
-          </li>
-        </ul>
- -->
       </div><!-- /#overview -->
 
 
@@ -232,41 +205,5 @@
     <script src="../js/bootstrap-scrollspy.js"></script>
     <script src="assets/js/application.js"></script>
 
-
-    <script type="text/javascript">
-      $(document).ready(function($){
-
-        function addCommas(nStr) {
-          nStr += '';
-          x = nStr.split('.');
-          x1 = x[0];
-          x2 = x.length > 1 ? '.' + x[1] : '';
-          var rgx = /(\d+)(\d{3})/;
-          while (rgx.test(x1)) {
-              x1 = x1.replace(rgx, '$1' + ',' + '$2');
-          }
-          return x1 + x2;
-        }
-
-        // GITHUB
-        window.repoCallback = function (obj) {
-
-          // Variables
-          var watchers = obj['repository']['watchers'];
-          var forks = obj['repository']['forks'];
-
-          // Echo out the counts in correct elements
-          $('.github-watchers .count').html(addCommas(watchers));
-          $('.github-forks .count').html(addCommas(forks));
-
-          // Debug log
-          // console.log("Watchers:" + watchers);
-          // console.log("Forks:" + forks);
-        }
-        $.ajax("http://github.com/api/v2/json/repos/show/twitter/bootstrap?callback=repoCallback", {dataType: "jsonp"});
-      });
-
-    </script>
-
   </body>
 </html>
diff --git a/docs/javascript.html b/docs/javascript.html
index 2db37a9fe..09cdc714c 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -83,7 +83,7 @@
       ================================================== -->
       <header class="jumbotron subhead" id="overview">
         <h1>Javascript for Bootstrap</h1>
-        <p class="lead">Bring Bootstrap's components to life with custom plugins for <a href="http://jquery.com/" target="_blank">jQuery</a> and <a href="http://ender.no.de" target="_blank">Ender</a></p>
+        <p class="lead">Bring Bootstrap's components to life with flexible, custom javascript plugins for many of our custom components that work with <a href="http://jquery.com/" target="_blank">jQuery</a> and <a href="http://ender.no.de" target="_blank">Ender</a>.</p>
       </header>
 
 
diff --git a/docs/less.html b/docs/less.html
index 2d35eea26..97d95a3ab 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -50,7 +50,7 @@
       ================================================== -->
       <header class="jumbotron subhead" id="overview">
         <h1>Using LESS with Bootstrap</h1>
-        <p class="lead">Be a boss and use Bootstrap's built-in variables, mixins, and more via LESS</p>
+        <p class="lead">Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.</p>
       </header>
 
 
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 10ad71a74..dd7f05bc6 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -50,9 +50,18 @@
       ================================================== -->
       <header class="jumbotron subhead" id="overview">
         <h1>Scaffolding</h1>
-        <p class="lead">Responsive 12-column grid and fixed- and fluid-width layouts</p>
+        <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>
 
+      <!-- Work in progress sub nav for docs -->
+      <div class="navbar subnav docked-top">
+        <ul class="nav">
+          <li class="active"><a href="#">Grid system</a></li>
+          <li><a href="#">Layouts</a></li>
+          <li><a href="#">Responsive</a></li>
+        </ul>
+      </div>
+
 
 
 <!-- Grid system
@@ -162,7 +171,7 @@
   </div>
 
   <h2>Grid customization</h2>
-  <table class="striped-table">
+  <table class="bordered-table striped-table">
     <thead>
       <tr>
         <th>Variable</th>
@@ -173,12 +182,12 @@
     <tbody>
       <tr>
         <td><code>@gridColumns</code></td>
-        <td>16</td>
+        <td>12</td>
         <td>The number of columns within the grid</td>
       </tr>
       <tr>
         <td><code>@gridColumnWidth</code></td>
-        <td>40px</td>
+        <td>60px</td>
         <td>The width of each column within the grid</td>
       </tr>
       <tr>
@@ -274,7 +283,7 @@
     <div class="span8">
       <h2>Supported devices</h2>
       <p>Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:</p>
-      <table class="striped-table">
+      <table class="bordered-table striped-table">
         <thead>
           <tr>
             <th>Label</th>