From bca269299b242c55a2511e752429c07d7639f7d2 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sat, 28 Jan 2012 23:40:52 -0800
Subject: removing required .navbar-static class, rewrote docs to reflect the
 change, and updated the upgrade docs page to include the navbar section

---
 less/navbar.less | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'less')

diff --git a/less/navbar.less b/less/navbar.less
index 404782e61..25ca7b4e2 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -7,11 +7,15 @@
 
 .navbar {
   overflow: visible;
+  margin-bottom: @baseLineHeight;
 }
-// gradient is applied to it's own element because overflow visible is not honored by IE when filter is present
+
+// Gradient is applied to it's own element because overflow visible is not honored by IE when filter is present
 .navbar-inner {
-  background-color: @navbarBackground;
+  padding-left:  20px;
+  padding-right: 20px;
   #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
+  .border-radius(4px);
   @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
   .box-shadow(@shadow);
 }
@@ -142,20 +146,9 @@
 }
 
 
-// STATIC OR FIXED?
-// ----------------
-
-// Static navbar
-.navbar-static {
-  margin-bottom: @baseLineHeight;
-}
-.navbar-static .navbar-inner {
-  padding-left:  20px;
-  padding-right: 20px;
-  .border-radius(4px);
-}
+// FIXED NAVBAR
+// ------------
 
-// Fixed navbar
 .navbar-fixed-top {
   position: fixed;
   top: 0;
@@ -163,6 +156,11 @@
   left: 0;
   z-index: @zindexFixedNavbar;
 }
+.navbar-fixed-top .navbar-inner {
+  padding-left:  0;
+  padding-right: 0;
+  .border-radius(0);
+}
 
 
 // NAVIGATION
-- 
cgit v1.2.3