mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip

Browse Source
This commit is contained in:
Mark Otto
2012-07-24 00:44:20 -07:00
parent 87aa61001e e38fa4b1f4
commit 394922a1bf
13 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/docs.css
+25 -15
View File
@@ -891,6 +891,7 @@ form.bs-docs-example {
min-height: 1px;
}
.bs-docs-sidenav {
width: 218px;
margin-top: 40px;
padding: 0;
margin-right: 10px;
@@ -935,24 +936,39 @@ form.bs-docs-example {
background-image: url(../img/glyphicons-halflings-white.png);
opacity: .75;
}
.bs-docs-sidenav.affix {
top: 40px;
}
@media (max-width: 979px) {
.bs-docs-sidenav.affix {
top: 0px;
}
@media (min-width: 1200px) {
.bs-docs-sidenav {
width: 258px;
}
}
@media (max-width: 979px) {
.bs-docs-sidenav {
top: 0px;
margin-top: 30px;
margin-right: 0;
}
}
@media (min-width: 768px) and (max-width: 979px) {
.bs-docs-sidenav {
width: 166px;
}
}
@media (max-width: 767px) {
.bs-docs-sidenav {
width: auto;
}
.bs-docs-sidenav.affix {
position: relative;
width: auto;
}
}
@media (min-width: 979px) {
.masthead,
@@ -983,10 +999,4 @@ form.bs-docs-example {
.subhead + .bs-docs-canvas {
top: 250px;
}
}
@media (max-width: 767px) {
.bs-docs-sidenav.affix {
position: relative;
}
}
}