mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-17 02:54:01 +02:00
Code Issues Releases Wiki 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
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 { #carbonads {
width: auto !important; display: block;
height: auto !important; padding: 15px 15px 15px 160px;
padding: 1.25rem !important; margin: 50px -15px 0;
margin: 2rem -30px -2rem !important;
overflow: hidden; overflow: hidden;
font-family: inherit !important; font-size: 13px;
font-size: .8rem !important; line-height: 1.5;
line-height: 1rem !important;
color: #cdbfe3 !important;
text-align: left; text-align: left;
background: #3e2c5a !important; border: solid #866ab3;
border: 0 !important; border-width: 1px 0 0;
} }
.carbonad-img { #carbonads a {
margin: 0 !important; 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;
}
.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;
} }
@media (min-width: 544px) { @media (min-width: 544px) {
.carbonad { #carbonads {
width: 330px !important; max-width: 330px;
padding: 1rem !important; margin: 50px auto 0;
margin-right: auto !important; border-width: 1px;
margin-left: auto !important; border-radius: 4px;
border-radius: .25rem;
} }
} }
@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 { .bd-content > table {
display: block; display: block;
width: 100%; 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 // Carbon ads
// //
.carbonad { #carbonads {
width: auto !important; display: block;
height: auto !important; padding: 15px 15px 15px 160px;
padding: 1.25rem !important; margin: 50px -15px 0;
margin: 2rem ($grid-gutter-width * -1) -2rem !important; overflow: hidden;
overflow: hidden; // clearfix font-size: 13px;
font-family: inherit !important; line-height: 1.5;
font-size: .8rem !important;
line-height: 1rem !important;
color: $bd-purple-light !important;
text-align: left; text-align: left;
background: darken($bd-purple, 10%) !important; border: solid #866ab3;
border: 0 !important; border-width: 1px 0 0;
}
.carbonad-img { a {
margin: 0 !important; color: #fff;
} text-decoration: none;
}
.carbonad-text, @include media-breakpoint-up(sm) {
.carbonad-tag { max-width: 330px;
display: block !important; margin: 50px auto 0;
float: none !important; border-width: 1px;
width: auto !important; border-radius: 4px;
height: auto !important; }
margin-left: 145px !important;
font-family: inherit !important;
}
.carbonad-text { @include media-breakpoint-up(lg) {
padding-top: 0 !important; position: absolute;
} top: 0;
right: 15px;
margin-top: 0;
.carbonad-tag { .bd-masthead & {
color: inherit !important; position: static;
text-align: left !important; }
}
.carbonad-text a,
.carbonad-tag a {
color: $bd-purple-light !important;
&:hover {
color: #fff !important;
} }
} }
@include media-breakpoint-up(sm) { .carbon-img {
.carbonad { float: left;
width: 330px !important; margin-left: -145px;
padding: 1rem !important;
margin-right: auto !important;
margin-left: auto !important;
border-radius: .25rem;
}
} }
@include media-breakpoint-up(md) { .carbon-poweredby {
display: block;
color: #cdbfe3 !important;
} }