summaryrefslogtreecommitdiffstats
path: root/themes
diff options
context:
space:
mode:
Diffstat (limited to 'themes')
-rw-r--r--themes/src/main/themes/VAADIN/themes/base/textfield/textfield.scss14
-rw-r--r--themes/src/main/themes/VAADIN/themes/chameleon/components/textfield/textfield.scss6
-rw-r--r--themes/src/main/themes/VAADIN/themes/reindeer/textfield/textfield.scss9
-rw-r--r--themes/src/main/themes/VAADIN/themes/runo/textfield/textfield.scss6
-rw-r--r--themes/src/main/themes/VAADIN/themes/valo/components/_textfield.scss6
5 files changed, 26 insertions, 15 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 4266346132..1b0dd89228 100644
--- a/themes/src/main/themes/VAADIN/themes/base/textfield/textfield.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/textfield/textfield.scss
@@ -13,7 +13,9 @@
.v-textarea-focus {
}
input.#{$primaryStyleName}-prompt,
-textarea.v-textarea-prompt {
+textarea.v-textarea-prompt,
+input[placeholder],
+textarea[placeholder] {
color: #999;
font-style: italic;
}
@@ -35,18 +37,18 @@ textarea.v-textarea-readonly:focus {
.v-textarea-error,
.#{$primaryStyleName}-error,
.v-richtextarea-error iframe.gwt-RichTextArea {
- background: #FFE0E0;
+ background: #FFE0E0;
}
*/
/* Disabled by default
.v-textarea-required,
.#{$primaryStyleName}-required,
.v-richtextarea-required iframe.gwt-RichTextArea {
- background: #FFE0E0;
+ background: #FFE0E0;
}
*/
/* Safari focus glow fix */
-.v-sa & input:focus,
+.v-sa & input:focus,
.v-sa & textarea:focus {
outline-width: medium;
}
@@ -106,7 +108,7 @@ textarea.v-textarea-readonly:focus {
}
.v-richtextarea .gwt-RichTextToolbar .gwt-ToggleButton img,
.v-richtextarea .gwt-RichTextToolbar .gwt-PushButton img {
-
+
}
.v-richtextarea .gwt-RichTextToolbar .gwt-ListBox {
width: 24.5%;
@@ -117,4 +119,4 @@ textarea.v-textarea-readonly:focus {
border: none;
}
-} \ No newline at end of file
+}
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 4554672da4..46366b899d 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,7 +48,9 @@ input.v-widget.#{$primaryStyleName}[type="text"],
}
&.v-app input.#{$primaryStyleName}-prompt,
-&.v-app textarea.v-textarea-prompt {
+&.v-app textarea.v-textarea-prompt,
+&.v-app input[placeholder],
+&.v-app textarea[placeholder] {
font-style: normal;
color: #999;
}
@@ -128,4 +130,4 @@ input.#{$primaryStyleName}-search[type=text],
padding-left: 17px;
}
-} \ No newline at end of file
+}
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 4bca7dbeb6..4ddb2054f1 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/textfield/textfield.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/textfield/textfield.scss
@@ -54,7 +54,9 @@
background-color: #fff;
}
input.#{$primaryStyleName}-prompt,
-textarea.v-textarea-prompt {
+textarea.v-textarea-prompt,
+input[placeholder],
+textarea[placeholder] {
font-style: normal;
color: #999;
}
@@ -105,7 +107,8 @@ textarea.v-textarea-prompt {
border-bottom-color: #507596;
background-color: #151717;
}
-.black input.#{$primaryStyleName}-prompt {
+.black input.#{$primaryStyleName}-prompt,
+.black input[placeholder] {
color: #5f6366;
}
/* Readonly */
@@ -117,4 +120,4 @@ textarea.v-textarea-readonly,
background: transparent;
}
-} \ No newline at end of file
+}
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 3516f529ce..505bc5d74b 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/textfield/textfield.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/textfield/textfield.scss
@@ -25,7 +25,9 @@ textarea.v-textarea {
border-color: #5daee8;
}
input.#{$primaryStyleName}-prompt,
-textarea.v-textarea-prompt {
+input[placeholder],
+textarea.v-textarea-prompt,
+textarea[placeholder] {
color: #999;
font-style: normal;
}
@@ -46,4 +48,4 @@ textarea.v-textarea-small {
padding: 1px 2px;
}
-} \ No newline at end of file
+}
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 a460ba4ca8..517ed03dc2 100644
--- a/themes/src/main/themes/VAADIN/themes/valo/components/_textfield.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_textfield.scss
@@ -211,7 +211,8 @@ $v-textfield-disabled-opacity: $v-disabled-opacity !default;
}
// TODO allow parent selector to be used in interpolation
- &[class*="prompt"] {
+ &[class*="prompt"],
+ &[placeholder] {
@include valo-textfield-prompt-style($background-color);
}
@@ -308,7 +309,8 @@ $v-textfield-disabled-opacity: $v-disabled-opacity !default;
@include box-shadow(none);
}
- &[class*="prompt"] {
+ &[class*="prompt"],
+ &[placeholder] {
@include valo-textfield-prompt-style($background-color);
}
}