rename navbar variables, change navbar search placeholder to mixin

3 files changed, 20 insertions, 18 deletions

diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index fec87a339..67642d1c4 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -32,8 +32,8 @@
 @import "close.less";
 
 // Components: Nav
-@import "navbar.less";
 @import "navs.less";
+@import "navbar.less";
 @import "breadcrumbs.less";
 @import "pagination.less";
 @import "pager.less";
diff --git a/lib/navbar.less b/lib/navbar.less
index 0d01fe524..94bc65241 100644
--- a/lib/navbar.less
+++ b/lib/navbar.less
@@ -1,22 +1,21 @@
 // NAVBAR (FIXED AND STATIC)
 // -------------------------
 
-// Navbar variables
-@navBarHeight: 40px;
-@navBarBgStart: #333;
-@navBarBgEnd: #222;
 
-// Common styles
+// COMMON STYLES
+// -------------
+
 .navbar {
   overflow: visible;
 }
 // gradient is applied to it's own element because overflow visible is not honored by IE when filter is present
 .navbar-inner {
-  background-color: @navBarBgEnd;
-  #gradient > .vertical(@navBarBgStart, @navBarBgEnd);
+  background-color: @navbarBackground;
+  #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
   @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
   .box-shadow(@shadow);
 }
+
 // Text and links
 .navbar {
   // Hover and active states
@@ -75,20 +74,16 @@
     #font > .sans-serif(13px, normal, 1);
     color: @white;
     color: rgba(255,255,255,.75);
-    background-color: #444;
-    background-color: rgba(255,255,255,.3);
+    background: #444;
+    background: rgba(255,255,255,.3);
     border: 1px solid #111;
     @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
     .box-shadow(@shadow);
     .transition(none);
 
     // Placeholder text gets special styles; can't be bundled together though for some reason
-    &:-moz-placeholder {
-      color: @grayLighter;
-    }
-    &::-webkit-input-placeholder {
-      color: @grayLighter;
-    }
+    .placeholder(@grayLighter);
+
     // Hover states
     &:hover {
       color: @white;
diff --git a/lib/variables.less b/lib/variables.less
index 8afe00032..807a9ea0d 100644
--- a/lib/variables.less
+++ b/lib/variables.less
@@ -51,6 +51,9 @@
 // COMPONENT VARIABLES
 // --------------------------------------------------
 
+// Input placeholder text color
+@placeHolderText:       @grayLight;
+
 // Z-index master list
 // Used for a bird's eye view of components dependent on the z-axis
 @zindexDropdown:        1000;
@@ -60,5 +63,9 @@
 @zindexModalBackdrop:   1040;
 @zindexModal:           1050;
 
-// Input placeholder text color
-@placeHolderText:       @grayLight;
+// Navbar
+@navBarHeight:                    40px;
+@navbarBackground:                #222;
+@navbarBackgroundHighlight:       #333;
+
+