Merged fix and sample for #2855 - "Implement input prompt for DateField" from /branches/6.4-minor-features

svn changeset:13646/svn branch:6.4

2 files changed, 10 insertions, 2 deletions

diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.css b/WebContent/VAADIN/themes/base/datefield/datefield.css
index e7a26a97fd..f1c38513e1 100644
--- a/WebContent/VAADIN/themes/base/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/base/datefield/datefield.css
@@ -8,6 +8,10 @@
 .v-datefield-button {
 	cursor: pointer;
 }
+.v-datefield-prompt .v-datefield-textfield {
+	color: #999;
+	font-style: italic;
+}
 .v-datefield .v-datefield-button-readonly {
 	display: none;
 }
diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index fd3522e312..f445cb2500 100644
--- a/WebContent/VAADIN/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"9_9_9_INTERNAL-DEBUG-BUILD";}
-.v-theme-version-9_9_9_INTERNAL-DEBUG-BUILD {display: none;}
+.v-theme-version:after {content:"6_4_0_dev-20100607";}
+.v-theme-version-6_4_0_dev-20100607 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -493,6 +493,10 @@ div.v-app-loading {
 .v-datefield-button {
 	cursor: pointer;
 }
+.v-datefield-prompt .v-datefield-textfield {
+	color: #999;
+	font-style: italic;
+}
 .v-datefield .v-datefield-button-readonly {
 	display: none;
 }