#4359 Immediate upload in FormLayout

svn changeset:11921/svn branch:6.3

diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index 726fe3504b0f5e9b9688947c8fc2f775bf827508..c39c2af769a69e20573098147c39d530522909ad 100644 (file)
--- a/WebContent/VAADIN/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_3_0_dev-20100315";}
-.v-theme-version-6_3_0_dev-20100315 {display: none;}
+.v-theme-version:after {content:"6_3_0_dev-20100317";}
+.v-theme-version-6_3_0_dev-20100317 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -1702,6 +1702,11 @@ div.v-tree-node-leaf {
        overflow: hidden;
 }
 
+.v-ff .v-upload-immediate,
+.v-op .v-upload-immediate {
+       display: inline-block;
+}
+
 .v-upload-immediate input {
        opacity: 0;
        filter: alpha(opacity=0);

diff --git a/WebContent/VAADIN/themes/base/upload/upload.css b/WebContent/VAADIN/themes/base/upload/upload.css
index eb5a3002964df8f34d13cb6e6c4a2bbed57ad5dc..126b21fa2f3bba0df8a17c6a274f8b4622d93473 100644 (file)
--- a/WebContent/VAADIN/themes/base/upload/upload.css
+++ b/WebContent/VAADIN/themes/base/upload/upload.css
@@ -4,6 +4,11 @@
        overflow: hidden;
 }
 
+.v-ff .v-upload-immediate,
+.v-op .v-upload-immediate {
+       display: inline-block;
+}
+
 .v-upload-immediate input {
        opacity: 0;
        filter: alpha(opacity=0);

diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index b250f4d4c2ee378144019f0122eafcabde36e49b..070687469a953e9b200956238117a4e9a78b5931 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_3_0_dev-20100315";}
-.v-theme-version-6_3_0_dev-20100315 {display: none;}
+.v-theme-version:after {content:"6_3_0_dev-20100317";}
+.v-theme-version-6_3_0_dev-20100317 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -1702,6 +1702,11 @@ div.v-tree-node-leaf {
        overflow: hidden;
 }
 
+.v-ff .v-upload-immediate,
+.v-op .v-upload-immediate {
+       display: inline-block;
+}
+
 .v-upload-immediate input {
        opacity: 0;
        filter: alpha(opacity=0);

diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index d4456daf0a472f281925850171a24f1c82878009..1e8a0de8210e0cec1cf03943829940819b09e2f5 100644 (file)
--- a/WebContent/VAADIN/themes/runo/styles.css
+++ b/WebContent/VAADIN/themes/runo/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_3_0_dev-20100315";}
-.v-theme-version-6_3_0_dev-20100315 {display: none;}
+.v-theme-version:after {content:"6_3_0_dev-20100317";}
+.v-theme-version-6_3_0_dev-20100317 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -1702,6 +1702,11 @@ div.v-tree-node-leaf {
        overflow: hidden;
 }
 
+.v-ff .v-upload-immediate,
+.v-op .v-upload-immediate {
+       display: inline-block;
+}
+
 .v-upload-immediate input {
        opacity: 0;
        filter: alpha(opacity=0);

diff --git a/tests/src/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java b/tests/src/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
index 2bf7f708a7c73afdee62d1556e3e0689fa856033..f4652aec18560801289f03e29d8cb4b4a8dab477 100644 (file)
--- a/tests/src/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
+++ b/tests/src/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
@@ -16,7 +16,7 @@ public class TestImmediateUploadInFormLayout extends ComponentTestCase implement
 \r
     @Override\r
     protected String getDescription() {\r
-        return "On Firefox 3.6 and Opera 10.10, clicking on an immediate upload in a wide FormLayout has no effect";\r
+        return "On Firefox 3.5 and Opera 10.10, clicking on an immediate upload in a wide FormLayout has no effect";\r
     }\r
 \r
     @Override\r