1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-28 23:59:53 +02:00

carbon update their ad code, so we have to overhaul our css to support new JS embeds

This commit is contained in:
Mark Otto
2016-04-26 15:00:03 -07:00
parent 3322e7dca4
commit 5f701f1013
80 changed files with 443 additions and 536 deletions

View File

@@ -686,80 +686,61 @@ form.bs-docs-example {
/* Ads in headers
-------------------------------------------------- */
.subhead h1,
.subhead .lead {
margin-right: 340px;
@media (min-width: 992px) {
.subhead h1,
.subhead .lead {
margin-right: 350px;
}
}
.carbonad {
position: absolute;
top: 0;
right: 0;
margin-top: 0 !important;
padding: 15px;
height: auto !important;
overflow: hidden; /* clearfix */
font-size: 13px !important;
line-height: 16px !important;
background: #222 !important; /* reset image and color in one line */
background: rgba(0,0,0,.5) !important;
border: 0 !important;
border-radius: 4px;
#carbonads {
display: block;
overflow: hidden;
margin: 40px -20px -40px;
padding: 15px 15px 15px 160px;
font-size: 13px;
line-height: 1.5;
text-align: left;
background-color: rgba(0,0,0,.5);
box-shadow: inset 0 3px 5px rgba(0,0,0,.5), 0 1px 0 rgba(255,255,255,.1);
}
.carbonad-img {
margin: 0 !important;
}
.carbonad-text,
.carbonad-tag,
.carbonad-tag a {
color: #fff !important;
}
.carbonad-text,
.carbonad-tag {
float: none !important;
display: block !important;
width: auto !important;
height: auto !important;
margin-left: 145px !important;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !important;
}
.carbonad-text {
padding-top: 0 !important;
}
.carbonad-tag {
text-align: left !important;
#carbonads a {
color: #fff;
}
/* Ads on homepage */
.masthead .carbonad {
position: static;
margin: 30px auto 0 !important;
text-align: left !important;
.carbon-img {
float: left;
margin-left: -145px;
}
@media (max-width: 980px) {
.carbonad {
position: static;
width: auto !important;
margin-top: 30px !important;
.carbon-poweredby {
display: block;
color: #cdbfe3 !important;
}
@media (min-width: 480px) {
#carbonads {
max-width: 155px; /* 330 - padding */
margin: 50px auto 0;
border-radius: 4px;
}
}
@media (max-width: 767px) {
.carbonad {
@media (min-width: 992px) {
#carbonads {
position: absolute;
top: 0;
right: 15px;
margin-top: 0;
}
.masthead #carbonads {
position: static;
width: auto !important;
margin: 40px -20px -40px !important;
padding: 20px !important;
overflow: hidden; /* clearfix */
border-radius: 0;
margin: 30px auto 0;
}
}
/* Responsive docs
-------------------------------------------------- */

View File

@@ -83,7 +83,7 @@
<div class="container">
<h1>Base CSS</h1>
<p class="lead">Fundamental HTML elements styled and enhanced with extensible classes.</p>
<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script type="text/javascript">var z = document.createElement("script"); z.type = "text/javascript"; z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZDARK"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>
<script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=getbootstrapcom" id="_carbonads_js"></script>
</div>
</header>

View File

@@ -83,7 +83,7 @@
<div class="container">
<h1>Components</h1>
<p class="lead">Dozens of reusable components built to provide navigation, alerts, popovers, and more.</p>
<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script type="text/javascript">var z = document.createElement("script"); z.type = "text/javascript"; z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZDARK"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>
<script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=getbootstrapcom" id="_carbonads_js"></script>
</div>
</header>

View File

@@ -83,7 +83,7 @@
<div class="container">
<h1>Customize and download</h1>
<p class="lead"><a href="https://github.com/twitter/bootstrap/zipball/master">Download Bootstrap</a> or customize variables, components, javascript plugins, and more.</p>
<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script type="text/javascript">var z = document.createElement("script"); z.type = "text/javascript"; z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZDARK"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>
<script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=getbootstrapcom" id="_carbonads_js"></script>
</div>
</header>

View File

@@ -83,7 +83,7 @@
<div class="container">
<h1>Extending Bootstrap</h1>
<p class="lead">Extend Bootstrap to take advantage of included styles and components, as well as LESS variables and mixins.</p>
<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script type="text/javascript">var z = document.createElement("script"); z.type = "text/javascript"; z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZDARK"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>
<script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=getbootstrapcom" id="_carbonads_js"></script>
<div>
</header>

View File

@@ -83,7 +83,7 @@
<div class="container">
<h1>Getting started</h1>
<p class="lead">Overview of the project, it's contents, and how to get started with a simple template.</p>
<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script type="text/javascript">var z = document.createElement("script"); z.type = "text/javascript"; z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZDARK"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>
<script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=getbootstrapcom" id="_carbonads_js"></script>
</div>
</header>

View File

@@ -87,7 +87,7 @@
<li><a href="./extend.html" >Extend</a></li>
<li>Version 2.1.0</li>
</ul>
<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script type="text/javascript">var z = document.createElement("script"); z.type = "text/javascript"; z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZDARK"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>
<script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=getbootstrapcom" id="_carbonads_js"></script>
</div>
</div>

View File

@@ -83,7 +83,7 @@
<div class="container">
<h1>JavaScript for Bootstrap</h1>
<p class="lead">Bring Bootstrap's components to life&mdash;now with 13 custom jQuery plugins.
<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script type="text/javascript">var z = document.createElement("script"); z.type = "text/javascript"; z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZDARK"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>
<script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=getbootstrapcom" id="_carbonads_js"></script>
</div>
</header>

View File

@@ -83,7 +83,7 @@
<div class="container">
<h1>Scaffolding</h1>
<p class="lead">Bootstrap is built on responsive 12-column grids, layouts, and components.</p>
<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script type="text/javascript">var z = document.createElement("script"); z.type = "text/javascript"; z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZDARK"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>
<script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=getbootstrapcom" id="_carbonads_js"></script>
</div>
</header>