From b28a74afbd735e073d6d3647de193f92ec1ce201 Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Wed, 17 Mar 2010 08:18:38 +0000
Subject: [PATCH] #4359 Immediate upload in FormLayout

svn changeset:11921/svn branch:6.3
---
 WebContent/VAADIN/themes/base/styles.css                 | 9 +++++++--
 WebContent/VAADIN/themes/base/upload/upload.css          | 5 +++++
 WebContent/VAADIN/themes/reindeer/styles.css             | 9 +++++++--
 WebContent/VAADIN/themes/runo/styles.css                 | 9 +++++++--
 .../upload/TestImmediateUploadInFormLayout.java          | 2 +-
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index 726fe3504b..c39c2af769 100644
--- 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 eb5a300296..126b21fa2f 100644
--- 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 b250f4d4c2..070687469a 100644
--- 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 d4456daf0a..1e8a0de821 100644
--- 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 2bf7f708a7..f4652aec18 100644
--- 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
 
     @Override
     protected String getDescription() {
-        return "On Firefox 3.6 and Opera 10.10, clicking on an immediate upload in a wide FormLayout has no effect";
+        return "On Firefox 3.5 and Opera 10.10, clicking on an immediate upload in a wide FormLayout has no effect";
     }
 
     @Override
-- 
2.39.5