_navbar.scss in bootstrap-sass-rails-2.2.2.0

- old
+ new

@@ -9,11 +9,10 @@
 
 // Base class and wrapper
 .navbar {
   overflow: visible;
   margin-bottom: $baseLineHeight;
-  color: $navbarText;
 
   // Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar
   *position: relative;
   *z-index: 2;
 }
@@ -65,10 +64,11 @@
 // Plain text in topbar
 // -------------------------
 .navbar-text {
   margin-bottom: 0;
   line-height: $navbarHeight;
+  color: $navbarText;
 }
 
 // Janky solution for now to account for links outside the .nav
 // -------------------------
 .navbar-link {
@@ -120,11 +120,11 @@
   input[type="radio"] {
     margin-top: 3px;
   }
   .input-append,
   .input-prepend {
-    margin-top: 6px;
+    margin-top: 5px;
     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
     }
   }
@@ -240,10 +240,11 @@
   text-decoration: none;
   text-shadow: 0 1px 0 $navbarBackgroundHighlight;
 }
 .navbar .nav .dropdown-toggle .caret {
   margin-top: 8px;
+
 }
 // Hover
 .navbar .nav > li > a:focus,
 .navbar .nav > li > a:hover {
   background-color: $navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active
@@ -328,10 +329,16 @@
     bottom: -6px;
     top: auto;
   }
 }
 
+// Caret should match text color on hover
+.navbar .nav li.dropdown > a:hover .caret {
+  border-top-color: $navbarLinkColorActive;
+  border-bottom-color: $navbarLinkColorActive;
+}
+
 // Remove background color from open dropdown
 .navbar .nav li.dropdown.open > .dropdown-toggle,
 .navbar .nav li.dropdown.active > .dropdown-toggle,
 .navbar .nav li.dropdown.open.active > .dropdown-toggle {
   background-color: $navbarLinkBackgroundActive;
@@ -374,11 +381,10 @@
 
 // Inverted navbar
 // -------------------------
 
 .navbar-inverse {
-  color: $navbarInverseText;
 
   .navbar-inner {
     @include gradient-vertical($navbarInverseBackgroundHighlight, $navbarInverseBackground);
     border-color: $navbarInverseBorder;
   }
@@ -390,10 +396,18 @@
     &:hover {
       color: $navbarInverseLinkColorHover;
     }
   }
 
+  .brand {
+    color: $navbarInverseBrandColor;
+  }
+
+  .navbar-text {
+    color: $navbarInverseText;
+  }
+
   .nav > li > a:focus,
   .nav > li > a:hover {
     background-color: $navbarInverseLinkBackgroundHover;
     color: $navbarInverseLinkColorHover;
   }
@@ -423,9 +437,13 @@
   .nav li.dropdown.open > .dropdown-toggle,
   .nav li.dropdown.active > .dropdown-toggle,
   .nav li.dropdown.open.active > .dropdown-toggle {
     background-color: $navbarInverseLinkBackgroundActive;
     color: $navbarInverseLinkColorActive;
+  }
+  .nav li.dropdown > a:hover .caret {
+    border-top-color: $navbarInverseLinkColorActive;
+    border-bottom-color: $navbarInverseLinkColorActive;
   }
   .nav li.dropdown > .dropdown-toggle .caret {
     border-top-color: $navbarInverseLinkColor;
     border-bottom-color: $navbarInverseLinkColor;
   }