aboutsummaryrefslogtreecommitdiff
path: root/assets/css/docs.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-07-26 00:04:24 -0700
committerMark Otto <[email protected]>2013-07-26 00:04:24 -0700
commitd604052aa5eee4f5df8298f1e3a82be408f09629 (patch)
treeddda43d9c3f3501c47963ebbcdeaa4fe65ac7832 /assets/css/docs.css
parentc23ba4d50b462b61a79eb5a46b52dc6904e88d28 (diff)
parent5588e14867ee5d917ec97a32329a216c3c0ed527 (diff)
downloadbootstrap-d604052aa5eee4f5df8298f1e3a82be408f09629.tar.xz
bootstrap-d604052aa5eee4f5df8298f1e3a82be408f09629.zip
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'assets/css/docs.css')
-rw-r--r--assets/css/docs.css18
1 files changed, 14 insertions, 4 deletions
diff --git a/assets/css/docs.css b/assets/css/docs.css
index b658a5f72..59cb1b19e 100644
--- a/assets/css/docs.css
+++ b/assets/css/docs.css
@@ -743,7 +743,6 @@ input.focused {
right: 15px;
bottom: 15px;
}
-
.bs-header {
font-size: 21px;
text-align: left;
@@ -799,12 +798,22 @@ input.focused {
@media screen and (min-width: 992px) {
/* Widen the fixed sidebar */
+ .bs-sidebar.affix,
+ .bs-sidebar.affix-bottom {
+ width: 213px;
+ }
.bs-sidebar.affix {
position: fixed; /* Undo the static from mobile-first approach */
- top: 50px;
- width: 213px;
+ top: 80px;
+ }
+ .bs-sidebar.affix-bottom {
+ position: absolute; /* Undo the static from mobile-first approach */
+ }
+ .bs-sidebar.affix-bottom .bs-sidenav,
+ .bs-sidebar.affix .bs-sidenav {
+ margin-top: 0;
+ margin-bottom: 0;
}
-
.bs-header h1,
.bs-header p {
margin-right: 380px;
@@ -824,6 +833,7 @@ input.focused {
@media screen and (min-width: 1200px) {
/* Widen the fixed sidebar again */
+ .bs-sidebar.affix-bottom,
.bs-sidebar.affix {
width: 270px;
}