mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-27 14:46:01 +03:00
Code Activity

add 1.0.0 to 2.3.1

Browse Source
This commit is contained in:
Mark Otto
2015-06-16 14:22:15 -07:00
parent 46736b44f6
commit 863b429e9a
979 changed files with 319619 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2.3.2/assets/css/docs.css
+17 -29
View File
@@ -860,7 +860,6 @@ form.bs-docs-example {
margin-right: 340px;
}
.treehouse,
.carbonad {
position: absolute;
top: 0;
@@ -902,34 +901,33 @@ form.bs-docs-example {
}
/* Ads on homepage */
.masthead .treehouse,
.masthead .carbonad {
position: static;
margin: 30px auto 0 !important;
text-align: left !important;
}
/* Custom Treehouse styles */
.treehouse {
width: 305px;
@media (max-width: 980px) {
.carbonad {
position: static;
width: auto !important;
margin-top: 30px !important;
}
}
.treehouse img {
float: left;
}
.treehouse-text {
display: block;
margin-left: 145px;
color: #fff;
}
.treehouse-link {
color: #fff !important;
}
.treehouse-link {
font-weight: bold;
color: #fff !important;
@media (max-width: 767px) {
.carbonad {
position: static;
width: auto !important;
margin: 40px -20px -40px !important;
padding: 20px !important;
overflow: hidden; /* clearfix */
border-radius: 0;
}
}
/* Responsive
-------------------------------------------------- */
@@ -976,14 +974,6 @@ form.bs-docs-example {
.subhead .lead {
margin-right: 0;
}
.treehouse,
.carbonad {
position: static;
width: auto !important;
margin-top: 30px !important;
}
}
/* Tablet to desktop
@@ -1036,8 +1026,6 @@ form.bs-docs-example {
margin: 0 -20px;
}
.treehouse,
.masthead .treehouse,
.carbonad {
position: static;
width: auto !important;