Skip to content
Browse files

Merge pull request #3619 from coreyti/2.0.4-wip-fix-placeholder

2.0.4 wip fix placeholder
  • Loading branch information...
2 parents 2870867 + 8a06339 commit 241cbd478dcacdbd0ddedaecb147bfc9b8f7e753 @mdo mdo committed May 28, 2012
Showing with 8 additions and 10 deletions.
  1. +4 −0 docs/assets/css/bootstrap.css
  2. +3 −3 less/mixins.less
  3. +1 −7 less/navbar.less
View
4 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;
}
View
6 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;
}
}
View
8 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,

0 comments on commit 241cbd4

Please sign in to comment.
Something went wrong with that request. Please try again.