fixes .placeholder to work as a "grouped selector"

adding the `&` combinator to `.placeholder` makes it work for the global case (in forms.less) as well as within `.navbar-search .search-query`

the result can be seen in the generated bootstrap.css, which include the -ms vendor extension.

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 2c0af2199f44cc3d05e1ee05fe0e3ee4ca6a56e6..029e32db77d4d5889d3d4b3d76ccdd2b06ec1265 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3713,6 +3713,10 @@ input[type="submit"].btn.btn-mini {
   color: #cccccc;
 }
 
+.navbar-search .search-query:-ms-input-placeholder {
+  color: #cccccc;
+}
+
 .navbar-search .search-query::-webkit-input-placeholder {
   color: #cccccc;
 }

diff --git a/less/mixins.less b/less/mixins.less
index ddc198535ddd2f0b7b9cac1a47ce2da0ee15529e..c3b57ed14238feca148dc8ab80e039a9c6bae066 100644 (file)
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -81,13 +81,13 @@
 // Placeholder text
 // -------------------------
 .placeholder(@color: @placeholderText) {
-  :-moz-placeholder {
+  &:-moz-placeholder {
     color: @color;
   }
-  :-ms-input-placeholder {
+  &:-ms-input-placeholder {
     color: @color;
   }
-  ::-webkit-input-placeholder {
+  &::-webkit-input-placeholder {
     color: @color;
   }
 }

diff --git a/less/navbar.less b/less/navbar.less
index 4faa7255b4ee479ab06622c64721a836c00eaa83..818f8a5a23a312df3aa2040a9ce863a43b4289e4 100644 (file)
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -123,13 +123,7 @@
     .box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)");
     .transition(none);
 
-    // Placeholder text gets special styles; can't be a grouped selector
-    &:-moz-placeholder {
-      color: @navbarSearchPlaceholderColor;
-    }
-    &::-webkit-input-placeholder {
-      color: @navbarSearchPlaceholderColor;
-    }
+    .placeholder(@navbarSearchPlaceholderColor);
 
     // Focus states (we use .focused since IE7-8 and down doesn't support :focus)
     &:focus,