diff options
author | Aleksi Hietanen <aleksi@vaadin.com> | 2016-08-25 11:32:58 +0300 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2016-08-29 09:02:32 +0000 |
commit | 91a7d965db6f4071e30c1892726099a0983de973 (patch) | |
tree | 945d85c79d6982d4784629450b57b1076342fbfd /themes | |
parent | b4861eda6bbda053277e3fb6858b8a94e8c3243b (diff) | |
download | vaadin-framework-91a7d965db6f4071e30c1892726099a0983de973.tar.gz vaadin-framework-91a7d965db6f4071e30c1892726099a0983de973.zip |
Fix placeholder styling
Placeholder styling was being applied to components even
when the placeholder was not visible. This commit removes
custom placeholder styling in favor of browser defaults.
Change-Id: I2a1b696235070435511867a10619fcdecd187e3b
Diffstat (limited to 'themes')
5 files changed, 7 insertions, 18 deletions
diff --git a/themes/src/main/themes/VAADIN/themes/base/textfield/textfield.scss b/themes/src/main/themes/VAADIN/themes/base/textfield/textfield.scss index 1b0dd89228..8eb4d18740 100644 --- a/themes/src/main/themes/VAADIN/themes/base/textfield/textfield.scss +++ b/themes/src/main/themes/VAADIN/themes/base/textfield/textfield.scss @@ -13,9 +13,7 @@ .v-textarea-focus { } input.#{$primaryStyleName}-prompt, -textarea.v-textarea-prompt, -input[placeholder], -textarea[placeholder] { +textarea.v-textarea-prompt { color: #999; font-style: italic; } diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/textfield/textfield.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/textfield/textfield.scss index 46366b899d..dc6500781a 100644 --- a/themes/src/main/themes/VAADIN/themes/chameleon/components/textfield/textfield.scss +++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/textfield/textfield.scss @@ -48,9 +48,7 @@ input.v-widget.#{$primaryStyleName}[type="text"], } &.v-app input.#{$primaryStyleName}-prompt, -&.v-app textarea.v-textarea-prompt, -&.v-app input[placeholder], -&.v-app textarea[placeholder] { +&.v-app textarea.v-textarea-prompt { font-style: normal; color: #999; } diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/textfield/textfield.scss b/themes/src/main/themes/VAADIN/themes/reindeer/textfield/textfield.scss index 4ddb2054f1..0d19cb5591 100644 --- a/themes/src/main/themes/VAADIN/themes/reindeer/textfield/textfield.scss +++ b/themes/src/main/themes/VAADIN/themes/reindeer/textfield/textfield.scss @@ -54,9 +54,7 @@ background-color: #fff; } input.#{$primaryStyleName}-prompt, -textarea.v-textarea-prompt, -input[placeholder], -textarea[placeholder] { +textarea.v-textarea-prompt { font-style: normal; color: #999; } @@ -107,8 +105,7 @@ textarea[placeholder] { border-bottom-color: #507596; background-color: #151717; } -.black input.#{$primaryStyleName}-prompt, -.black input[placeholder] { +.black input.#{$primaryStyleName}-prompt { color: #5f6366; } /* Readonly */ diff --git a/themes/src/main/themes/VAADIN/themes/runo/textfield/textfield.scss b/themes/src/main/themes/VAADIN/themes/runo/textfield/textfield.scss index 505bc5d74b..680c3d68ec 100644 --- a/themes/src/main/themes/VAADIN/themes/runo/textfield/textfield.scss +++ b/themes/src/main/themes/VAADIN/themes/runo/textfield/textfield.scss @@ -25,9 +25,7 @@ textarea.v-textarea { border-color: #5daee8; } input.#{$primaryStyleName}-prompt, -input[placeholder], -textarea.v-textarea-prompt, -textarea[placeholder] { +textarea.v-textarea-prompt { color: #999; font-style: normal; } diff --git a/themes/src/main/themes/VAADIN/themes/valo/components/_textfield.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_textfield.scss index 517ed03dc2..a460ba4ca8 100644 --- a/themes/src/main/themes/VAADIN/themes/valo/components/_textfield.scss +++ b/themes/src/main/themes/VAADIN/themes/valo/components/_textfield.scss @@ -211,8 +211,7 @@ $v-textfield-disabled-opacity: $v-disabled-opacity !default; } // TODO allow parent selector to be used in interpolation - &[class*="prompt"], - &[placeholder] { + &[class*="prompt"] { @include valo-textfield-prompt-style($background-color); } @@ -309,8 +308,7 @@ $v-textfield-disabled-opacity: $v-disabled-opacity !default; @include box-shadow(none); } - &[class*="prompt"], - &[placeholder] { + &[class*="prompt"] { @include valo-textfield-prompt-style($background-color); } } |