merge in new ads

diff --git a/_layouts/home.html b/_layouts/home.html
index 416b3e2bf0c947f164946f3050c5316313cb0f26..c8328feb44dce09415065a071e03e065fc9a756a 100644 (file)
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -14,6 +14,8 @@
     {{ content }}
 
     <footer class="container" role="contentinfo">
+      {% include ads.html %}
+
       {% include social-buttons.html %}
 
       <ul class="bs-masthead-links">
@@ -29,9 +31,6 @@
         <li>
           <a href="{{ page.base_url }}getting-started/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
         </li>
-        <li>
-          <a href="{{ page.base_url }}components/#glyphicons" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Glyphicons']);">Glyphicons</a>
-        </li>
         <li>
           <a href="{{ site.expo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Expo</a>
         </li>

diff --git a/docs-assets/css/docs.css b/docs-assets/css/docs.css
index 86fcfc6da2ff55dc30322607d78fa04cf1ec0859..fa472f0805ffaa6bc6427d1e03eb6982759cb79f 100644 (file)
--- a/docs-assets/css/docs.css
+++ b/docs-assets/css/docs.css
@@ -379,6 +379,39 @@ body {
   }
 }
 
+/* Homepage variations */
+.bs-docs-home .carbonad {
+  margin: 0 -15px 40px !important;
+}
+@media screen and (min-width: 480px) {
+  .bs-docs-home .carbonad {
+    width: 330px !important;
+    margin: 0 auto 40px !important;
+    border-radius: 4px;
+  }
+}
+@media screen and (min-width: 768px) {
+  .bs-docs-home .carbonad {
+    float: left;
+    width: 330px !important;
+    margin: 0 0 30px !important;
+  }
+  .bs-docs-home .bs-social,
+  .bs-docs-home .bs-masthead-links {
+    margin-left: 350px;
+  }
+}
+@media screen and (min-width: 992px) {
+  .bs-docs-home .carbonad {
+    position: static;
+  }
+}
+@media screen and (min-width: 1170px) {
+  .bs-docs-home .carbonad {
+    margin-top: -25px !important;
+  }
+}
+
 
 /*
  * Callout for 2.3.2 docs