derp on navbar toggle and docs positions

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b4a3b5854fd542d56066b07ff4c80777a47c7381..5e5d325a6469c13bc4fb76462f89f778b3ffc20a 100644 (file)
--- 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 0e9292495945b8ff9cb79737f9be57543e2e6428..ff605b21e94ddfdca57f82df7e740962ad6a202b 100644 (file)
--- 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 48e2aae0beb74746124f621db04dd06cd88ef8db..c405293ea7275fb7b66aa4b5abf20661af4474c5 100644 (file)
--- 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">

diff --git a/less/navbar.less b/less/navbar.less
index 587b69ca4e32d1f54c0b8f5d4c02c818d26791ff..cc5e307e8434c1154963c5567466620a4f889c42 100644 (file)
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -17,7 +17,7 @@
 
 .navbar-nav {
   // Space out from .navbar .brand and .btn-navbar
-  margin-top: 15px;
+  margin-top: 5px;
 
   > li > a {
     padding-top: ((@navbar-height - @line-height-base) / 2);
@@ -96,7 +96,7 @@
 // Collapsible navbar toggle
 .navbar-toggle {
   position: absolute;
-  top: 10px;
+  top: 18px;
   right: 10px;
   padding: 8px 12px;
   background-color: transparent;