Merge branch 'master' into boulox-responsive-embed

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/css.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css

2 files changed, 11 insertions, 75 deletions

diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index d4bcf2559..8dc51026e 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -11,7 +11,7 @@
     {% include nav-main.html %}
 
     <!-- Docs page layout -->
-    <div class="bs-header" id="content">
+    <div class="bs-docs-header" id="content">
       <div class="container">
         <h1>{{ page.title }}</h1>
         <p>{{ page.lead }}</p>
@@ -19,15 +19,15 @@
       </div>
     </div>
 
-    <!-- Callout for the old docs link -->
-    {% include old-bs-docs.html %}
-
     <div class="container bs-docs-container">
 
       <div class="row">
+        <div class="col-md-9" role="main">
+          {{ content }}
+        </div>
         <div class="col-md-3">
-          <div class="bs-sidebar hidden-print" role="complementary">
-            <ul class="nav bs-sidenav">
+          <div class="bs-docs-sidebar hidden-print" role="complementary">
+            <ul class="nav bs-docs-sidenav">
               {% if page.slug == "getting-started" %}
                 {% include nav-getting-started.html %}
               {% elsif page.slug == "css" %}
@@ -40,48 +40,19 @@
                 {% include nav-customize.html %}
               {% elsif page.slug == "about" %}
                 {% include nav-about.html %}
+              {% elsif page.slug == "migration" %}
+                {% include nav-migration.html %}
               {% endif %}
             </ul>
+            <a class="back-to-top" href="#top">
+              Back to top
+            </a>
           </div>
         </div>
-        <div class="col-md-9" role="main">
-          {{ content }}
-        </div>
       </div>
 
     </div>
 
-    <!-- Footer
-    ================================================== -->
-    <footer class="bs-footer" role="contentinfo">
-      <div class="container">
-        {% include social-buttons.html %}
-
-        <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
-        <p>Maintained by the <a href="https://github.com/twbs?tab=members">core team</a> with the help of <a href="https://github.com/twbs/bootstrap/graphs/contributors">our contributors</a>.</p>
-        <p>Code licensed under <a href="https://github.com/twbs/bootstrap/blob/master/LICENSE" target="_blank">MIT</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
-        <ul class="footer-links">
-          <li>Currently v{{ site.current_version }}</li>
-          <li class="muted">&middot;</li>
-          <li><a href="{{ site.baseurl }}2.3.2/">Bootstrap 2.3.2 docs</a></li>
-          <li class="muted">&middot;</li>
-          <li><a href="{{ site.repo }}">GitHub project</a></li>
-          <li class="muted">&middot;</li>
-          <li><a href="{{ site.baseurl }}getting-started/#examples">Examples</a></li>
-          <li class="muted">&middot;</li>
-          <li><a href="{{ site.expo }}">Expo</a></li>
-          <li class="muted">&middot;</li>
-          <li><a href="{{ site.blog }}">Blog</a></li>
-          <li class="muted">&middot;</li>
-          <li><a href="{{ site.repo }}/issues?state=open">Issues</a></li>
-          <li class="muted">&middot;</li>
-          <li><a href="{{ site.repo }}/releases">Releases</a></li>
-        </ul>
-      </div>
-    </footer>
-
-    <!-- JS and analytics only. -->
     {% include footer.html %}
-
   </body>
 </html>
diff --git a/docs/_layouts/home.html b/docs/_layouts/home.html
index 4872a09b2..ace319038 100644
--- a/docs/_layouts/home.html
+++ b/docs/_layouts/home.html
@@ -13,41 +13,6 @@
     <!-- Page content of course! -->
     {{ content }}
 
-    <footer class="container" role="contentinfo">
-      {% include ads.html %}
-
-      {% include social-buttons.html %}
-
-      <ul class="bs-masthead-links">
-        <li class="current-version">
-          Currently v{{ site.current_version }}
-        </li>
-        <li>
-          <a href="{{ site.baseurl }}2.3.2/">Bootstrap 2.3.2 docs</a>
-        </li>
-        <li>
-          <a href="{{ site.repo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
-        </li>
-        <li>
-          <a href="{{ site.baseurl }}getting-started/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
-        </li>
-        <li>
-          <a href="{{ site.expo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Expo</a>
-        </li>
-        <li>
-          <a href="{{ site.blog }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Blog']);">Blog</a>
-        </li>
-        <li>
-          <a href="{{ site.repo }}/issues?state=open" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Issues']);">Issues</a>
-        </li>
-        <li>
-          <a href="{{ site.repo }}/releases" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Releases']);">Releases</a>
-        </li>
-      </ul>
-    </footer>
-
-    <!-- JS and analytics only. -->
     {% include footer.html %}
-
   </body>
 </html>