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

Conflicts:
	docs/templates/pages/index.mustache

1 files changed, 33 insertions, 34 deletions

diff --git a/docs/index.html b/docs/index.html
index aea901cb5..75b23b7c3 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -74,13 +74,13 @@
             <div class="benefits">
               <h4>Feature highlights</h4>
               <ul>
-                <li><span>&times;</span> Built on LESS</li>
-                <li><span>&times;</span> Complete styleguide docs</li>
-                <li><span>&times;</span> Fully responsive design</li>
-                <li><span>&times;</span> Small footprint (7kb gzipped)</li>
-                <li><span>&times;</span> Support for IE7 and up</li>
-                <li><span>&times;</span> Custom jQuery plugins</li>
-                <li><span>&times;</span> Dozens of components</li>
+                <li><span>&#10004;</span> Built on LESS</li>
+                <li><span>&#10004;</span> Complete style guide docs</li>
+                <li><span>&#10004;</span> Fully responsive design</li>
+                <li><span>&#10004;</span> Small footprint (10kb gzipped)</li>
+                <li><span>&#10004;</span> Support for IE7 and up</li>
+                <li><span>&#10004;</span> Custom jQuery plugins</li>
+                <li><span>&#10004;</span> Dozens of components</li>
               </ul>
             </div>
           </div>
@@ -216,33 +216,32 @@
           ================================================== -->
           <h1>Get started in no time.</h1>
           <p class="marketing-byline">Quickly start using Bootstrap within your workflow and development process.</p>
-          <table class="table table-bordered getting-started">
-            <tbody>
-              <tr>
-                <td class="quick-start">
-                  <h3>Hotlink the CSS</h3>
-                  <p>For the quickest and easiest start, just copy this snippet into your webpage.</p>
-                  <form>
-                    <textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea>
-                  </form>
-                </td>
-                <td class="quick-start">
-                  <h3>Use it with LESS</h3>
-                  <p>A fan of using LESS? No problem, just clone the repo and add these lines:</p>
-                  <form>
-                    <textarea class="copy-code" rows="2">&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt;
-      &lt;script src="/path/to/less.js"&gt;&lt;/script&gt;</textarea>
-                  </form>
-                </td>
-                <td class="quick-start">
-                  <h3>Fork on GitHub</h3>
-                  <p>Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.</p>
-                  <p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">Bootstrap on GitHub &raquo;</a></p>
-                  <p class="current-version">Currently <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p>
-                </td>
-              </tr>
-            </tbody>
-          </table>
+          <div class="getting-started">
+            <div class="row">
+              <div class="span4">
+                <h3>Hotlink the CSS</h3>
+                <p>For the quickest and easiest start, just copy this snippet into your webpage.</p>
+                <form>
+                  <textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea>
+                </form>
+              </div> 
+              <div class="span4">
+                <h3>Use it with LESS</h3>
+                <p>A fan of using LESS? No problem, just download the repo and add these lines to your page:</p>
+                <form>
+                  <textarea class="copy-code" rows="2">&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt;
+    &lt;script src="/path/to/less.js"&gt;&lt;/script&gt;</textarea>
+                </form>
+              </div> 
+              <div class="span4">
+                <h3>Fork on GitHub</h3>
+                <p>Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.</p>
+                <p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">Bootstrap on GitHub &raquo;</a></p>
+                <p class="current-version">Currently <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p>
+              </div> 
+            </div><!-- /row -->
+          </div><!-- /getting-started -->
+
         </div><!-- /.marketing -->
       </div><!-- /#overview -->
      <!-- Footer