From 4a63dc62bfb5cbc41002a77df6acb68bcf7a3bfb Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 21 Aug 2016 22:38:08 -0700
Subject: [PATCH] Update ads code and styles (also fixes #20477 in different
 way)

---
 docs/_includes/ads.html          |   2 +-
 docs/assets/css/docs.min.css     |  86 ++++++++++++++-----------------
 docs/assets/css/docs.min.css.map | Bin 28229 -> 27964 bytes
 docs/assets/scss/_ads.scss       |  84 ++++++++++++------------------
 4 files changed, 73 insertions(+), 99 deletions(-)

diff --git a/docs/_includes/ads.html b/docs/_includes/ads.html
index ba4775f5e..662b62971 100644
--- a/docs/_includes/ads.html
+++ b/docs/_includes/ads.html
@@ -1 +1 @@
-<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script>var z = document.createElement("script"); z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZ"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>
+<script async type="text/javascript" src="https://cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=getbootstrapcom" id="_carbonads_js"></script>
diff --git a/docs/assets/css/docs.min.css b/docs/assets/css/docs.min.css
index 3d4f5a396..5daf17102 100644
--- a/docs/assets/css/docs.min.css
+++ b/docs/assets/css/docs.min.css
@@ -281,64 +281,54 @@
   }
 }
 
-.carbonad {
-  width: auto !important;
-  height: auto !important;
-  padding: 1.25rem !important;
-  margin: 2rem -30px -2rem !important;
+#carbonads {
+  display: block;
+  padding: 15px 15px 15px 160px;
+  margin: 50px -15px 0;
   overflow: hidden;
-  font-family: inherit !important;
-  font-size: .8rem !important;
-  line-height: 1rem !important;
-  color: #cdbfe3 !important;
+  font-size: 13px;
+  line-height: 1.5;
   text-align: left;
-  background: #3e2c5a !important;
-  border: 0 !important;
+  border: solid #866ab3;
+  border-width: 1px 0 0;
 }
 
-.carbonad-img {
-  margin: 0 !important;
-}
-
-.carbonad-text,
-.carbonad-tag {
-  display: block !important;
-  float: none !important;
-  width: auto !important;
-  height: auto !important;
-  margin-left: 145px !important;
-  font-family: inherit !important;
-}
-
-.carbonad-text {
-  padding-top: 0 !important;
-}
-
-.carbonad-tag {
-  color: inherit !important;
-  text-align: left !important;
-}
-
-.carbonad-text a,
-.carbonad-tag a {
-  color: #cdbfe3 !important;
-}
-
-.carbonad-text a:hover,
-.carbonad-tag a:hover {
-  color: #fff !important;
+#carbonads a {
+  color: #fff;
+  text-decoration: none;
 }
 
 @media (min-width: 544px) {
-  .carbonad {
-    width: 330px !important;
-    padding: 1rem !important;
-    margin-right: auto !important;
-    margin-left: auto !important;
-    border-radius: .25rem;
+  #carbonads {
+    max-width: 330px;
+    margin: 50px auto 0;
+    border-width: 1px;
+    border-radius: 4px;
   }
 }
 
+@media (min-width: 992px) {
+  #carbonads {
+    position: absolute;
+    top: 0;
+    right: 15px;
+    margin-top: 0;
+  }
+  .bd-masthead #carbonads {
+    position: static;
+  }
+}
+
+.carbon-img {
+  float: left;
+  margin-left: -145px;
+}
+
+.carbon-poweredby {
+  display: block;
+  color: #cdbfe3 !important;
+}
+
 .bd-content > table {
   display: block;
   width: 100%;
diff --git a/docs/assets/css/docs.min.css.map b/docs/assets/css/docs.min.css.map
index 004420802269eb50827515b3cf89c773dacc291e..acb040ee271fc8748b45fef45a5b45dad9a00ebd 100644
GIT binary patch
delta 469
zcmZ{hO-lk%6oxS<#8stMB4O>y?jkZ2xvTfw8HP~@wL#QYS&P)tJ_w~%v~1Dp{E?t-
z(5gQXZTcsj>mayka~3c69G>^NUq7*r@7UW)me(p7K8PoHHJ{kMA>fX*3sWW)0D*D=
zS9O7&4eyDc-3|U+&-3q5nqSJf!#dE^22+}l*1*s>3TV5kg-%l$v`=Kf%!a)HhLdL1
z*<2o*M>2et%07+EL@vu3AZutvk9`cNp+X>x7^*^}eVE}QSR3ft@RlrNH+ty-z74NQ
z^#pt&^w4_{OpUP#ym>$Fr;^$K7^c+V*Zt!QAE?@!rxD@IiWGCThhS)hRXizBqKa@7
z>5`;FiTX6}Q>4&tpR1<mih#s!UABeN0>Q6wEKD;wDPF2=Wn8OKd<^762KE|^)z>H9
YiRY46l8#8Un}W4&3dVWg&h6Fz0Mb!`5dZ)H

delta 917
zcmb7@&q~8U5XLEjH&5DJDheW^uplZ@N=~zr*oInStyNkC=|B3v7lRZpd5FA#kDz$<
z>Pv_h-^7{SHk;-m<`lln&V1i*vL9cW&+p9ZdM>O1)C2;c?E+qlGC*0l0Iui(^d*Z=
zQd9scDRnM|58!KcECHsf_&izc0eIZo<+fwVuT_3kB8oadJya7MQRPo+F3s{;97%Bp
zaF-r1K%p$F+CI%4F6Wx+*m_<r0tGmfEo~SdskNhq)0j1!VDw;FA)C>&C{~57l3^Cv
zO92xI8UQUD0Rw5<l+6)9k7$t^b8P-u-T~;)Y3wdehpWd8S`+bP8794*|Ln{_GK~vF
zI+sRG0Y|6<MnC)6O>=OW|18?OKaghi<j+9VE1)L%1f`y!*p8y4Q4xTFjCvQlZJi;&
zuGvy&u_T1@OgXtysMAddpx0KsiD&7Cd3Jaki8-Vdo6*aul{M(d+MKP;@G^Qk+MZ0Y
zHj{c8=1O?0S7L#T)Rn(qXC?Jn3WC$nzfr6*-k7dZqvKm^qsTYQCI=WerT49!L;n})
C_W0re

diff --git a/docs/assets/scss/_ads.scss b/docs/assets/scss/_ads.scss
index 405cac30a..237b1e70b 100644
--- a/docs/assets/scss/_ads.scss
+++ b/docs/assets/scss/_ads.scss
@@ -1,66 +1,50 @@
-// scss-lint:disable ImportantRule
+// scss-lint:disable ImportantRule, IdSelector
 
 //
 // Carbon ads
 //
 
-.carbonad {
-  width: auto !important;
-  height: auto !important;
-  padding: 1.25rem !important;
-  margin: 2rem ($grid-gutter-width * -1) -2rem !important;
-  overflow: hidden; // clearfix
-  font-family: inherit !important;
-  font-size: .8rem !important;
-  line-height: 1rem !important;
-  color: $bd-purple-light !important;
+#carbonads {
+  display: block;
+  padding: 15px 15px 15px 160px;
+  margin: 50px -15px 0;
+  overflow: hidden;
+  font-size: 13px;
+  line-height: 1.5;
   text-align: left;
-  background: darken($bd-purple, 10%) !important;
-  border: 0 !important;
-}
+  border: solid #866ab3;
+  border-width: 1px 0 0;
 
-.carbonad-img {
-  margin: 0 !important;
-}
+  a {
+    color: #fff;
+    text-decoration: none;
+  }
 
-.carbonad-text,
-.carbonad-tag {
-  display: block !important;
-  float: none !important;
-  width: auto !important;
-  height: auto !important;
-  margin-left: 145px !important;
-  font-family: inherit !important;
-}
+  @include media-breakpoint-up(sm) {
+    max-width: 330px;
+    margin: 50px auto 0;
+    border-width: 1px;
+    border-radius: 4px;
+  }
 
-.carbonad-text {
-  padding-top: 0 !important;
-}
+  @include media-breakpoint-up(lg) {
+    position: absolute;
+    top: 0;
+    right: 15px;
+    margin-top: 0;
 
-.carbonad-tag {
-  color: inherit !important;
-  text-align: left !important;
-}
-
-.carbonad-text a,
-.carbonad-tag a {
-  color: $bd-purple-light !important;
-
-  &:hover {
-    color: #fff !important;
+    .bd-masthead & {
+      position: static;
+    }
   }
 }
 
-@include media-breakpoint-up(sm) {
-  .carbonad {
-    width: 330px !important;
-    padding: 1rem !important;
-    margin-right: auto !important;
-    margin-left: auto !important;
-    border-radius: .25rem;
-  }
+.carbon-img {
+  float: left;
+  margin-left: -145px;
 }
 
-@include media-breakpoint-up(md) {
-
+.carbon-poweredby {
+  display: block;
+  color: #cdbfe3 !important;
 }