Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip

Conflicts:
	js/tests/unit/bootstrap-collapse.js

1 files changed, 28 insertions, 55 deletions

diff --git a/docs/index.html b/docs/index.html
index 17afe11c4..685039dea 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,77 +1,50 @@
 ---
-layout: default
+layout: home
 title: Bootstrap
 ---
 
 <div class="bs-docs-jumbotron masthead">
   <div class="container">
+
     <h1>Bootstrap</h1>
     <p class="lead">Sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.</p>
     <p>
       <a href="assets/bootstrap.zip" class="btn btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0']);">Download Bootstrap</a>
+      <a href="./docs/" class="btn btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Docs', 'View docs']);">View docs</a>
     </p>
+
+    <div class="bs-docs-social">
+      <ul class="bs-docs-social-buttons">
+        <li>
+          <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twitter&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
+        </li>
+        <li>
+          <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="102px" height="20px"></iframe>
+        </li>
+        <li class="follow-btn">
+          <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @twbootstrap</a>
+        </li>
+        <li class="tweet-btn">
+          <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://twitter.github.com/bootstrap/" data-count="horizontal" data-via="twbootstrap" data-related="mdo:Creator of Twitter Bootstrap">Tweet</a>
+        </li>
+      </ul>
+    </div>
+
     <ul class="masthead-links">
       <li>
+        <a href="./customize/" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Customize']);">Customize</a>
+      </li>
+      <li>
         <a href="http://github.com/twitter/bootstrap" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
       </li>
       <li>
-        <a href="./getting-started/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
+        <a href="./docs/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
+      </li>
+      <li>
+        <a href="http://expo.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a>
       </li>
       <li>Version 3.0.0</li>
     </ul>
-  </div>
-</div>
-
-<div class="container">
-
-  <div class="bs-docs-marketing">
-
-    <h1>Introducing Bootstrap.</h1>
-    <p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p>
-
-    <div class="row">
-      <div class="col-span-4">
-        <img class="marketing-img" src="assets/img/bs-docs-twitter-github.png">
-        <h2>By nerds, for nerds.</h2>
-        <p>Built at Twitter by <a href="http://twitter.com/mdo">@mdo</a> and <a href="http://twitter.com/fat">@fat</a>, Bootstrap utilizes <a href="http://lesscss.org">LESS CSS</a>, is compiled via <a href="http://nodejs.org">Node</a>, and is managed through <a href="http://github.com">GitHub</a> to help nerds do awesome stuff on the web.</p>
-      </div>
-      <div class="col-span-4">
-        <img class="marketing-img" src="assets/img/bs-docs-responsive-illustrations.png">
-        <h2>Made for everyone.</h2>
-        <p>Bootstrap 3 has been rebuilt from the ground up to push the Web forward. It looks and behaves great on the latest smartphones, tablets, and desktops (including support for IE8+).</p>
-      </div>
-      <div class="col-span-4">
-        <img class="marketing-img" src="assets/img/bs-docs-bootstrap-features.png">
-        <h2>Packed with features.</h2>
-        <p>A 12-column responsive <a href="./css/#grid-system">grid</a>, dozens of components, <a href="./javascript/">JavaScript plugins</a>, typography, form controls, and even a <a href="./customize/">web-based Customizer</a> to make Bootstrap your own.</p>
-      </div>
-    </div>
-
-    <h1>Built with Bootstrap.</h1>
-    <p class="marketing-byline">For more sites built with Bootstrap, <a href="http://expo.getbootstrap.com">visit the Expo</a> or <a href="./getting-started/#examples">browse the examples</a>.</p>
-    <div class="row bs-docs-gallery">
-      <div class="col-span-3">
-        <a class="thumbnail" href="http://delicious.com" target="_blank">
-          <img src="http://expo.getbootstrap.com/screenshots/delicious.jpg" alt="Delicious">
-        </a>
-      </div>
-      <div class="col-span-3">
-        <a class="thumbnail" href="https://yourkarma.com" target="_blank">
-          <img src="http://expo.getbootstrap.com/screenshots/karma.jpg" alt="Karma">
-        </a>
-      </div>
-      <div class="col-span-3">
-        <a class="thumbnail" href="http://soundready.fm/" target="_blank">
-          <img src="http://expo.getbootstrap.com/screenshots/soundready.jpg" alt="SoundReady">
-        </a>
-      </div>
-      <div class="col-span-3">
-        <a class="thumbnail" href="http://kippt.com/" target="_blank">
-          <img src="http://expo.getbootstrap.com/screenshots/kippt.jpg" alt="Kippt">
-        </a>
-      </div>
-    </div>
 
   </div>
-
 </div>