From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 29 Jan 2012 21:16:02 +0000 (-0800)
Subject: Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
X-Git-Tag: v2.0.0~6^2~47^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=910e78d26ad476d11331e8bb9b0233e0b2ba21e3;p=thirdparty%2Fbootstrap.git

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

910e78d26ad476d11331e8bb9b0233e0b2ba21e3
diff --cc docs/index.html
index 3ecc7718f8,69972c8437..e20d08bcdd
--- a/docs/index.html
+++ b/docs/index.html
@@@ -80,20 -80,8 +80,8 @@@
              <p>Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.</p>
              <p class="download-info">
                <a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">View project on GitHub</a>
 -              <a href="http://bootstrap.herokuapp.com/bootstrap.zip" class="btn btn-large">Download Bootstrap</a>
 +              <a href="assets/bootstrap.zip" class="btn btn-large">Download Bootstrap</a>
              </p>
-             <div class="benefits">
-               <h4>Feature highlights</h4>
-               <ul>
-                 <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>
  
            <ul class="quick-links">
diff --cc docs/templates/pages/index.mustache
index 7a98afa07d,4ae3b7a6f8..d49f95f9b8
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@@ -8,20 -8,8 +8,8 @@@
              <p>Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.</p>
              <p class="download-info">
                <a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">{{_i}}View project on GitHub{{/i}}</a>
 -              <a href="http://bootstrap.herokuapp.com/bootstrap.zip" class="btn btn-large">{{_i}}Download Bootstrap{{/i}}</a>
 +              <a href="assets/bootstrap.zip" class="btn btn-large">{{_i}}Download Bootstrap{{/i}}</a>
              </p>
-             <div class="benefits">
-               <h4>{{_i}}Feature highlights{{/i}}</h4>
-               <ul>
-                 <li><span>&#10004;</span> {{_i}}Built on LESS{{/i}}</li>
-                 <li><span>&#10004;</span> {{_i}}Complete style guide docs{{/i}}</li>
-                 <li><span>&#10004;</span> {{_i}}Fully responsive design{{/i}}</li>
-                 <li><span>&#10004;</span> {{_i}}Small footprint (10kb 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>
  
            <ul class="quick-links">