From: Corey Innis <corey@coolerator.net>
Date: Mon, 28 May 2012 01:12:08 +0000 (-0700)
Subject: fixes .placeholder to work as a "grouped selector"
X-Git-Tag: v2.0.4~1^2~6^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3619%2Fhead;p=thirdparty%2Fbootstrap.git

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 2c0af2199f..029e32db77 100644
--- 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 ddc198535d..c3b57ed142 100644
--- 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 4faa7255b4..818f8a5a23 100644
--- 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,