From: Mark Otto <markotto@twitter.com>
Date: Mon, 14 May 2012 05:11:35 +0000 (-0700)
Subject: #3257: share .navbar-fixed-top styles with .navbar-fixed-bottom
X-Git-Tag: v2.0.4~1^2~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=826a8714e266e488fc51bc9ca779556731b8afd3;p=thirdparty%2Fbootstrap.git

#3257: share .navbar-fixed-top styles with .navbar-fixed-bottom
---

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 4791a686f9..9f32f08085 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -683,11 +683,18 @@
   body {
     padding-top: 0;
   }
-  .navbar-fixed-top {
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
     position: static;
+  }
+  .navbar-fixed-top {
     margin-bottom: 18px;
   }
-  .navbar-fixed-top .navbar-inner {
+  .navbar-fixed-bottom {
+    margin-top: 18px;
+  }
+  .navbar-fixed-top .navbar-inner,
+  .navbar-fixed-bottom .navbar-inner {
     padding: 5px;
   }
   .navbar .container {
diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less
index d49b8ae12d..8d31db5310 100644
--- a/less/responsive-navbar.less
+++ b/less/responsive-navbar.less
@@ -9,11 +9,18 @@
     padding-top: 0;
   }
   // Unfix the navbar
-  .navbar-fixed-top {
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
     position: static;
+  }
+  .navbar-fixed-top {
     margin-bottom: @baseLineHeight;
   }
-  .navbar-fixed-top .navbar-inner {
+  .navbar-fixed-bottom {
+    margin-top: @baseLineHeight;
+  }
+  .navbar-fixed-top .navbar-inner,
+  .navbar-fixed-bottom .navbar-inner {
     padding: 5px;
   }
   .navbar .container {