From 1b2b049ef827553e20c995710d11982fa9d53f79 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 8 Feb 2013 08:32:29 -0800 Subject: [PATCH] Fixes #6841: Add new Firefox placeholder, comments --- docs/assets/css/bootstrap.css | 5 +++++ less/mixins.less | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 01d6d23f74..9e1ad72e60 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 46241ab46b..ad15971217 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