From: Jacob Thornton <jacobthornton@gmail.com>
Date: Mon, 20 Aug 2012 23:13:46 +0000 (-0700)
Subject: fMerge branch '2.1.0-wip'
X-Git-Tag: v2.1.0~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d63e8e2a84468351b4c1ee6cc21f48e95ea27bf;p=thirdparty%2Fbootstrap.git

fMerge branch '2.1.0-wip'

Conflicts:
	docs/index.html
---

5d63e8e2a84468351b4c1ee6cc21f48e95ea27bf
diff --cc docs/index.html
index 7f46ae4870,74a45aa6df..5389b5d8f9
--- a/docs/index.html
+++ b/docs/index.html
@@@ -74,31 -69,24 +69,24 @@@
        </div>
      </div>
  
-     <div class="container">
- 
- <!-- Masthead
- ================================================== -->
- <header class="jumbotron masthead">
-   <div class="inner">
-     <h1>Bootstrap, from Twitter</h1>
-     <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 btn-primary btn-large" >View project on GitHub</a>
-       <a href="assets/bootstrap.zip" class="btn btn-large" >Download Bootstrap <small>(v2.0.4)</small></a>
-     </p>
+ <div class="jumbotron masthead">
+   <div class="container">
+     <h1>Bootstrap</h1>
+     <p>Sleek, intuitive, and powerful front-end framework for faster and easier web development.</p>
+     <p><a href="assets/bootstrap.zip" class="btn btn-primary btn-large" >Download Bootstrap</a></p>
+     <ul class="masthead-links">
+       <li><a href="http://github.com/twitter/bootstrap" >GitHub project</a></li>
+       <li><a href="./extend.html" >Extend</a></li>
+       <li>Version 2.1.0</li>
+     </ul>
    </div>
+ </div>
  
-   <div class="bs-links">
-     <ul class="quick-links">
-       <li><a href="./upgrading.html">Upgrading from 1.4</a></li>
-       <li><a href="https://github.com/twitter/bootstrap/zipball/master">Download with docs</a></li>
-       <li><a href="http://blog.getbootstrap.com">Read the blog</a></li>
-       <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Submit issues</a></li>
-       <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
-     </ul>
-     <ul class="quick-links">
+ <div class="bs-docs-social">
+   <div class="container">
+     <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>
 +        <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="112px" 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="98px" height="20px"></iframe>