aboutsummaryrefslogtreecommitdiff
path: root/lib/forms.less
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-07-02 10:47:25 -0700
committerJacob Thornton <[email protected]>2011-07-02 10:47:25 -0700
commite112d34b42d3ad23f662a646159f6266ab1b86ba (patch)
treee8f06bd35b007c7895c5484d5cd9934daa544ee1 /lib/forms.less
parent088bfcc13a1f85557d12553a7942e3284c6ceae5 (diff)
parent5992b4e0af8b65ecbd429ccb4c6809aaa50edbd9 (diff)
downloadbootstrap-e112d34b42d3ad23f662a646159f6266ab1b86ba.tar.xz
bootstrap-e112d34b42d3ad23f662a646159f6266ab1b86ba.zip
Merge branch 'master' of http://git.local.twitter.com/bootstrap
Diffstat (limited to 'lib/forms.less')
-rw-r--r--lib/forms.less9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/forms.less b/lib/forms.less
index 74aa7a4df..4a1c359e3 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -79,6 +79,13 @@ form {
border-color: #ccc;
.box-shadow(inset 0 1px 2px rgba(0,0,0,.075));
}
+ // Placeholder text gets special styles; can't be bundled together though for some reason
+ :-moz-placeholder {
+ color: @grayLight;
+ }
+ ::-webkit-input-placeholder {
+ color: @grayLight;
+ }
// Focus states
input[type=text],
input[type=password],
@@ -229,7 +236,7 @@ div.input-append {
height: 18px;
text-align: center;
text-shadow: 0 1px 0 #fff;
- border: 1px solid #bbb;
+ border: 1px solid #ccc;
border-right-width: 0;
.border-radius(3px 0 0 3px);
}