rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-29 21:52:22 +01:00
Code Issues Actions Packages Releases Activity

Update ads code and styles (also fixes #20477 in different way)

Browse Source
This commit is contained in:
Mark Otto 2016-08-21 22:38:08 -07:00
parent 07f341e30e
commit 4a63dc62bf
4 changed files with 74 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/_includes/ads.html
View File

@ -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>

86
docs/assets/css/docs.min.css vendored
View File

@ -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%;

2
docs/assets/css/docs.min.css.map
View File

File diff suppressed because one or more lines are too long

84
docs/assets/scss/_ads.scss
View File

@ -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;
}