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/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index 8cf926123..030a693a8 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -14,13 +14,13 @@
             <div class="benefits">
               <h4>{{_i}}Feature highlights{{/i}}</h4>
               <ul>
-                <li><span>&times;</span> {{_i}}Built on LESS{{/i}}</li>
-                <li><span>&times;</span> {{_i}}Complete styleguide docs{{/i}}</li>
-                <li><span>&times;</span> {{_i}}Fully responsive design{{/i}}</li>
-                <li><span>&times;</span> {{_i}}Small footprint (7kb gzipped){{/i}}</li>
-                <li><span>&times;</span> {{_i}}Support for IE7 and up{{/i}}</li>
-                <li><span>&times;</span> {{_i}}Custom jQuery plugins{{/i}}</li>
-                <li><span>&times;</span> {{_i}}Dozens of components{{/i}}</li>
+                <li><span>&#10004;</span> {{_i}}Built on LESS{{/i}}</li>
+                <li><span>&#10004;</span> {{_i}}Complete styleguide docs{{/i}}</li>
+                <li><span>&#10004;</span> {{_i}}Fully responsive design{{/i}}</li>
+                <li><span>&#10004;</span> {{_i}}Small footprint (7kb gzipped){{/i}}</li>
+                <li><span>&#10004;</span> {{_i}}Support for IE7 and up{{/i}}</li>
+                <li><span>&#10004;</span> {{_i}}Custom jQuery plugins{{/i}}</li>
+                <li><span>&#10004;</span> {{_i}}Dozens of components{{/i}}</li>
               </ul>
             </div>
           </div>
@@ -156,32 +156,31 @@
           ================================================== -->
           <h1>{{_i}}Get started in no time.{{/i}}</h1>
           <p class="marketing-byline">{{_i}}Quickly start using Bootstrap within your workflow and development process.{{/i}}</p>
-          <table class="table table-bordered getting-started">
-            <tbody>
-              <tr>
-                <td class="quick-start">
-                  <h3>{{_i}}Hotlink the CSS{{/i}}</h3>
-                  <p>{{_i}}For the quickest and easiest start, just copy this snippet into your webpage.{{/i}}</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>{{_i}}Use it with LESS{{/i}}</h3>
-                  <p>{{_i}}A fan of using LESS? No problem, just clone the repo and add these lines:{{/i}}</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>{{_i}}Fork on GitHub{{/i}}</h3>
-                  <p>{{_i}}Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.{{/i}}</p>
-                  <p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">{{_i}}Bootstrap on GitHub &raquo;{{/i}}</a></p>
-                  <p class="current-version">{{_i}}Currently{{/i}} <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>{{_i}}Hotlink the CSS{{/i}}</h3>
+                <p>{{_i}}For the quickest and easiest start, just copy this snippet into your webpage.{{/i}}</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>{{_i}}Use it with LESS{{/i}}</h3>
+                <p>{{_i}}A fan of using LESS? No problem, just download the repo and add these lines to your page:{{/i}}</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>{{_i}}Fork on GitHub{{/i}}</h3>
+                <p>{{_i}}Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.{{/i}}</p>
+                <p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">{{_i}}Bootstrap on GitHub &raquo;{{/i}}</a></p>
+                <p class="current-version">{{_i}}Currently{{/i}} <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p>
+              </div> 
+            </div><!-- /row -->
+          </div><!-- /getting-started -->
+
         </div><!-- /.marketing -->
       </div><!-- /#overview -->
\ No newline at end of file