aboutsummaryrefslogtreecommitdiff
path: root/docs/assets/css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-01-16 16:20:29 -0800
committerMark Otto <[email protected]>2013-01-16 16:20:29 -0800
commit6b193dc22d544d55100c6c0eb237a30b8eaf184b (patch)
treebace945aa66a34ce9ce2705dfb65e82b95318dc1 /docs/assets/css
parent9ba14cfb7c0daa75453fd226d09198ffec142b1b (diff)
downloadbootstrap-6b193dc22d544d55100c6c0eb237a30b8eaf184b.tar.xz
bootstrap-6b193dc22d544d55100c6c0eb237a30b8eaf184b.zip
More navbar tweaks, including making fixed navbars work in the docs by adding padding to body
Diffstat (limited to 'docs/assets/css')
-rw-r--r--docs/assets/css/bootstrap.css13
-rw-r--r--docs/assets/css/docs.css4
2 files changed, 11 insertions, 6 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 70eaace26..d1feacac1 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2882,7 +2882,7 @@ button.close {
.navbar .brand {
display: inline-block;
- padding: 15px 15px;
+ padding: 7px 15px;
font-size: 18px;
font-weight: bold;
line-height: 20px;
@@ -2919,10 +2919,6 @@ button.close {
margin-top: 15px;
}
-.navbar .nav > li {
- float: left;
-}
-
.navbar .nav > li > a {
padding-top: 15px;
padding-bottom: 15px;
@@ -2943,13 +2939,15 @@ button.close {
background-color: #d5d5d5;
}
-@media screen and (min-width: 992px) {
+@media screen and (min-width: 768px) {
.navbar {
padding-top: 0;
padding-bottom: 0;
}
.navbar .brand {
float: left;
+ padding-top: 15px;
+ padding-bottom: 15px;
margin-left: -15px;
}
.navbar .nav {
@@ -2963,6 +2961,9 @@ button.close {
.navbar .nav:after {
clear: both;
}
+ .navbar .nav > li {
+ float: left;
+ }
.navbar .btn-navbar {
display: none;
}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 38fd87a44..4e52cdf61 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -10,6 +10,7 @@
body {
position: relative; /* For scrollyspy */
+ padding-top: 62px; /* Default height of navbar */
}
/* */
@@ -197,6 +198,9 @@ section > ul li {
/* Affix all the things, and set widths because they're positioned, depending on viewport size */
@media screen and (min-width: 768px) {
+ body {
+ padding-top: 44px;
+ }
/* From here, start to affix the nav because we keep columns here */
.bs-docs-sidenav.affix {
position: fixed;