navbar.less in twitter-bootstrap-rails-2.0.3

- old
+ new

@@ -79,11 +79,11 @@
   .btn,
   .btn-group {
     margin-top: 5px; // make buttons vertically centered in navbar
   }
   .btn-group .btn {
-    margin-top: 0;
+    margin-top: 0; // then undo the margin here so we don't accidentally double it
   }
 }
 
 // Navbar forms
 .navbar-form {
@@ -102,10 +102,18 @@
   input[type="image"],
   input[type="checkbox"],
   input[type="radio"] {
     margin-top: 3px;
   }
+  .input-append,
+  .input-prepend {
+    margin-top: 6px;
+    white-space: nowrap; // preven two  items from separating within a .navbar-form that has .pull-left
+    input {
+      margin-top: 0; // remove the margin on top since it's on the parent
+    }
+  }
 }
 
 // Navbar search
 .navbar-search {
   position: relative;
@@ -131,11 +139,11 @@
     &:hover {
       color: @white;
       background-color: @grayLight;
       background-color: rgba(255,255,255,.5);
     }
-    // Focus states (we use .focused since IE8 and down doesn't support :focus)
+    // Focus states (we use .focused since IE7-8 and down doesn't support :focus)
     &:focus,
     &.focused {
       padding: 5px 10px;
       color: @grayDark;
       text-shadow: 0 1px 0 @white;
@@ -159,11 +167,11 @@
   z-index: @zindexFixedNavbar;
 }
 .navbar-fixed-top .navbar-inner {
   padding-left:  0;
   padding-right: 0;
-  .border-radius(0px);
+  .border-radius(0);
 }
 
 
 // NAVIGATION
 // ----------
@@ -192,22 +200,21 @@
   text-decoration: none;
   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
 }
 // Hover
 .navbar .nav > li > a:hover {
-  background-color: transparent;
+  background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active
   color: @navbarLinkColorHover;
   text-decoration: none;
 }
 
 // Active nav items
 .navbar .nav .active > a,
 .navbar .nav .active > a:hover {
   color: @navbarLinkColorHover;
   text-decoration: none;
   background-color: @navbarBackground;
-  background-color: rgba(0,0,0,.5);
 }
 
 // Dividers (basically a vertical hr)
 .navbar .divider-vertical {
   height: @navbarHeight;
@@ -287,6 +294,6 @@
   }
   &:after {
     left: auto;
     right: 13px;
   }
-}
+}
\ No newline at end of file