diff options
| author | Mark Otto <[email protected]> | 2012-05-28 01:00:23 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-05-28 01:00:23 -0700 |
| commit | 241cbd478dcacdbd0ddedaecb147bfc9b8f7e753 (patch) | |
| tree | a8b2966e4f98e4249517d6f7f798be09520099a3 | |
| parent | 287086758be44fd35db83ffd763966b866381ce9 (diff) | |
| parent | 8a06339501587f9ecc62f6a831162cf40e8a0c70 (diff) | |
| download | bootstrap-241cbd478dcacdbd0ddedaecb147bfc9b8f7e753.tar.xz bootstrap-241cbd478dcacdbd0ddedaecb147bfc9b8f7e753.zip | |
Merge pull request #3619 from coreyti/2.0.4-wip-fix-placeholder
2.0.4 wip fix placeholder
| -rw-r--r-- | docs/assets/css/bootstrap.css | 4 | ||||
| -rw-r--r-- | less/mixins.less | 6 | ||||
| -rw-r--r-- | less/navbar.less | 8 |
3 files changed, 8 insertions, 10 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 2c0af2199..029e32db7 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 ddc198535..c3b57ed14 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 4faa7255b..818f8a5a2 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, |