aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-04-28 14:27:48 -0700
committerMark Otto <[email protected]>2013-04-28 14:27:48 -0700
commitbbee78b30b40ff0b1473a06ea7ecf5a42d51b614 (patch)
tree45afa4de72a43b1c3d5fd11aa652742af083e02f /docs
parent8b3a1702d443c4a451d02d3482ed2cb4aeff0d44 (diff)
downloadbootstrap-bbee78b30b40ff0b1473a06ea7ecf5a42d51b614.tar.xz
bootstrap-bbee78b30b40ff0b1473a06ea7ecf5a42d51b614.zip
derp on navbar toggle and docs positions
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/css/bootstrap.css2
-rw-r--r--docs/assets/css/docs.css14
-rw-r--r--docs/docs.html4
3 files changed, 16 insertions, 4 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b4a3b5854..5e5d325a6 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3516,7 +3516,7 @@ button.close {
}
.navbar-nav {
- margin-top: 15px;
+ margin-top: 5px;
}
.navbar-nav > li > a {
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 0e9292495..ff605b21e 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -308,14 +308,21 @@ section > ul li {
.bs-navbar-bottom-example {
z-index: 1;
padding: 0;
- height: 110px;
+ min-height: 110px;
overflow: hidden; /* cut the drop shadows off */
}
.bs-navbar-top-example .navbar-fixed-top,
.bs-navbar-bottom-example .navbar-fixed-bottom {
+ position: relative;
margin-left: 0;
margin-right: 0;
}
+.bs-navbar-top-example .navbar-fixed-top {
+ top: -1px;
+}
+.bs-navbar-bottom-example .navbar-fixed-bottom {
+ bottom: -1px;
+}
.bs-navbar-top-example {
-webkit-border-radius: 0 0 4px 4px;
-moz-border-radius: 0 0 4px 4px;
@@ -711,6 +718,11 @@ input.focused {
text-align: left;
}
+ .bs-navbar-top-example .navbar-fixed-top,
+ .bs-navbar-bottom-example .navbar-fixed-bottom {
+ position: absolute;
+ }
+
}
/* Tablets/desktops and up */
diff --git a/docs/docs.html b/docs/docs.html
index 48e2aae0b..c405293ea 100644
--- a/docs/docs.html
+++ b/docs/docs.html
@@ -3506,7 +3506,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<h3 id="navbar-fixed-top">Fixed to top</h3>
<p>Add <code>.navbar-fixed-top</code>.</p>
<div class="bs-docs-example bs-navbar-top-example">
- <div class="navbar navbar-fixed-top" style="position: absolute; top: -1px;">
+ <div class="navbar navbar-fixed-top">
<div class="container" style="width: auto;">
<a class="navbar-brand" href="#">Title</a>
<ul class="nav navbar-nav">
@@ -3542,7 +3542,7 @@ body {
<h3 id="navbar-fixed-bottom">Fixed to bottom</h3>
<p>Add <code>.navbar-fixed-bottom</code> instead.</p>
<div class="bs-docs-example bs-navbar-bottom-example">
- <div class="navbar navbar-fixed-bottom" style="position: absolute; bottom: -1px;">
+ <div class="navbar navbar-fixed-bottom">
<div class="container" style="width: auto;">
<a class="navbar-brand" href="#">Title</a>
<ul class="nav navbar-nav">