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

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-08-15 14:45:41 -07:00
parent ada5589184 74bda55d4c
commit fd509cb370
21 changed files with 96 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/docs.css
+13 -3
View File
@@ -813,9 +813,13 @@ form.bs-docs-example {
opacity: .75;
}
.bs-docs-sidenav.affix {
top: 30px;
top: 40px;
}
.bs-docs-sidenav.affix-bottom {
position: absolute;
top: auto;
bottom: 270px;
}
@@ -868,12 +872,15 @@ form.bs-docs-example {
}
/* Widen masthead and social buttons to fill body padding */
.jumbotron {
margin-top: -20px; /* Offset bottom margin on .navbar */
margin-top: -20px; /* Offset bottom margin on .navbar */
}
/* Adjust sidenav width */
.bs-docs-sidenav {
width: 166px;
}
.bs-docs-sidenav.affix {
top: 0px;
}
}
/* Tablet
@@ -929,6 +936,9 @@ form.bs-docs-example {
.footer p {
margin-bottom: 9px;
}
.bs-docs-sidenav.affix {
top: 0;
}
}
/* Landscape phones