mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-16 10:34:07 +02:00
Code Issues Releases Wiki Activity

Merge branch 'bs3_add_ads' into bs3_rc1

Browse Source
This commit is contained in:
Mark Otto
2013-07-18 13:07:17 -07:00
parent cc63096118 d7d1c2a767
commit 9425382376
3 changed files with 58 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/_includes/ads.html Normal file
View File

@@ -0,0 +1 @@
<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_HORIZ"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>

1
docs/_layouts/default.html
View File

@@ -15,6 +15,7 @@
<div class="container"> <div class="container">
<h1>{{ page.title }}</h1> <h1>{{ page.title }}</h1>
<p>{{ page.lead }}</p> <p>{{ page.lead }}</p>
{% include ads.html %}
</div> </div>
</div> </div>

59
docs/assets/css/docs.css
View File

@@ -155,6 +155,45 @@ body {
font-weight: 300; font-weight: 300;
line-height: 1.5; line-height: 1.5;
} }
.bs-header .container {
position: relative;
}
/* Ads in page headers */
.carbonad {
width: auto !important;
margin: 50px -30px -40px !important;
padding: 20px !important;
overflow: hidden; /* clearfix */
height: auto !important;
font-size: 13px !important;
line-height: 16px !important;
text-align: left;
background: none !important;
border: 0 !important;
border-top: 1px solid #e5e5e5 !important;
}
.carbonad-img {
margin: 0 !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;
}
.carbonad #azcarbon > img {
display: none; /* hide what I assume are tracking images */
}
/* Padding for in-page bookmarks */ /* Padding for in-page bookmarks */
.bs-docs-section { .bs-docs-section {
@@ -720,6 +759,12 @@ input.focused {
line-height: 1; line-height: 1;
} }
.carbonad {
margin: 0 !important;
border: 1px solid #e5e5e5 !important;
border-radius: 4px;
}
/* Show the docs nav */ /* Show the docs nav */
.bs-sidebar { .bs-sidebar {
display: block; display: block;
@@ -756,9 +801,17 @@ input.focused {
width: 213px; width: 213px;
} }
/* Icons */ .bs-header h1,
.the-icons li { .bs-header p {
width: 12.5%; margin-right: 380px;
}
.carbonad {
position: absolute;
top: 0;
right: 0;
padding: 15px !important;
width: 330px !important;
min-height: 132px;
} }
} }