aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-02-08 08:32:29 -0800
committerMark Otto <[email protected]>2013-02-08 08:32:29 -0800
commit1b2b049ef827553e20c995710d11982fa9d53f79 (patch)
treefb618e25828c1a6daea68e4a4e8a5cba628123ba
parent3eed90c18752df8b86c97afe90e2c75d55ff1637 (diff)
downloadbootstrap-1b2b049ef827553e20c995710d11982fa9d53f79.tar.xz
bootstrap-1b2b049ef827553e20c995710d11982fa9d53f79.zip
Fixes #6841: Add new Firefox placeholder, comments
-rw-r--r--docs/assets/css/bootstrap.css5
-rw-r--r--less/mixins.less13
2 files changed, 9 insertions, 9 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 01d6d23f7..9e1ad72e6 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1178,6 +1178,11 @@ textarea:-moz-placeholder {
color: #999999;
}
+input::-moz-placeholder,
+textarea::-moz-placeholder {
+ color: #999999;
+}
+
input:-ms-input-placeholder,
textarea:-ms-input-placeholder {
color: #999999;
diff --git a/less/mixins.less b/less/mixins.less
index 46241ab46..ad1597121 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -54,15 +54,10 @@
// Placeholder text
.placeholder(@color: @input-color-placeholder) {
- &:-moz-placeholder {
- color: @color;
- }
- &:-ms-input-placeholder {
- color: @color;
- }
- &::-webkit-input-placeholder {
- color: @color;
- }
+ &:-moz-placeholder { color: @color; } // Firefox 4-18
+ &::-moz-placeholder { color: @color; } // Firefox 19+
+ &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+
+ &::-webkit-input-placeholder { color: @color; } // Safari and Chrome
}
// Text overflow