aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-06-04 08:33:42 -0700
committerMark Otto <[email protected]>2012-06-04 08:33:42 -0700
commiteb3a4b8f759299e4157bd32deb6016587f48acb4 (patch)
tree21d328b3ea30714e36fec3b94bf8de45cd4b1b80
parentad9bfeef7a27cb470f520798cd806cb310f4e9c8 (diff)
downloadbootstrap-eb3a4b8f759299e4157bd32deb6016587f48acb4.tar.xz
bootstrap-eb3a4b8f759299e4157bd32deb6016587f48acb4.zip
fix placeholder for FF by attaching input and textarea when we call the mixin
-rw-r--r--docs/assets/css/bootstrap.css9
-rw-r--r--less/forms.less5
2 files changed, 10 insertions, 4 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 23dbd76fc..e7e270614 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1232,15 +1232,18 @@ select:focus:required:invalid:focus {
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
}
-:-moz-placeholder {
+input:-moz-placeholder,
+textarea:-moz-placeholder {
color: #999999;
}
-:-ms-input-placeholder {
+input:-ms-input-placeholder,
+textarea:-ms-input-placeholder {
color: #999999;
}
-::-webkit-input-placeholder {
+input::-webkit-input-placeholder,
+textarea::-webkit-input-placeholder {
color: #999999;
}
diff --git a/less/forms.less b/less/forms.less
index 1163fe914..56f215d6c 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -343,7 +343,10 @@ select:focus:required:invalid {
}
// Placeholder text gets special styles; can't be bundled together though for some reason
-.placeholder();
+input,
+textarea {
+ .placeholder();
+}