Fixes #3280: Immediate upload component doesn't respect upload button caption width

svn changeset:8664/svn branch:6.1

5 files changed, 50 insertions, 44 deletions

diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index 40e7d93e48..9dffa473b3 100644
--- a/WebContent/VAADIN/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/styles.css
@@ -1498,26 +1498,25 @@ div.v-tree-node-leaf {
 
 .v-upload-immediate {
 	position: relative;
-	width: 10em;
-	margin:0;
-	overflow:hidden;
+	margin: 0;
+	overflow: hidden;
 }
 
 .v-upload-immediate input {
 	opacity: 0;
 	filter: alpha(opacity=0);
-	z-index:2;
+	z-index: 2;
 	position: absolute;
-	right:0;
-	height:21px;
+	right: 0;
+	height: 21px;
 	text-align: right;
 }
 .v-upload-immediate button {
-	position:relative;
-	left:0;
-	top:0;
-	width:100%;
-	text-align:left;
+	position: relative;
+	left: 0;
+	top: 0;
+	width: 100%;
+	text-align: left;
 }
   
 
diff --git a/WebContent/VAADIN/themes/base/upload/upload.css b/WebContent/VAADIN/themes/base/upload/upload.css
index d9299ae65c..73f9490738 100644
--- a/WebContent/VAADIN/themes/base/upload/upload.css
+++ b/WebContent/VAADIN/themes/base/upload/upload.css
@@ -1,24 +1,23 @@
 .v-upload-immediate {
 	position: relative;
-	width: 10em;
-	margin:0;
-	overflow:hidden;
+	margin: 0;
+	overflow: hidden;
 }
 
 .v-upload-immediate input {
 	opacity: 0;
 	filter: alpha(opacity=0);
-	z-index:2;
+	z-index: 2;
 	position: absolute;
-	right:0;
-	height:21px;
+	right: 0;
+	height: 21px;
 	text-align: right;
 }
 .v-upload-immediate button {
-	position:relative;
-	left:0;
-	top:0;
-	width:100%;
-	text-align:left;
+	position: relative;
+	left: 0;
+	top: 0;
+	width: 100%;
+	text-align: left;
 }
   
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index 8f75bb11d4..1cf162a7b6 100644
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -1498,26 +1498,25 @@ div.v-tree-node-leaf {
 
 .v-upload-immediate {
 	position: relative;
-	width: 10em;
-	margin:0;
-	overflow:hidden;
+	margin: 0;
+	overflow: hidden;
 }
 
 .v-upload-immediate input {
 	opacity: 0;
 	filter: alpha(opacity=0);
-	z-index:2;
+	z-index: 2;
 	position: absolute;
-	right:0;
-	height:21px;
+	right: 0;
+	height: 21px;
 	text-align: right;
 }
 .v-upload-immediate button {
-	position:relative;
-	left:0;
-	top:0;
-	width:100%;
-	text-align:left;
+	position: relative;
+	left: 0;
+	top: 0;
+	width: 100%;
+	text-align: left;
 }
   
 
diff --git a/WebContent/VAADIN/themes/runo/button/button.css b/WebContent/VAADIN/themes/runo/button/button.css
index 667c230f17..53762a03df 100644
--- a/WebContent/VAADIN/themes/runo/button/button.css
+++ b/WebContent/VAADIN/themes/runo/button/button.css
@@ -16,6 +16,8 @@
 	border: 1px solid #babfc0;

 	border-bottom-color: #a5abac;

 	background: #fff url(img/bg.png);

+	-webkit-background-origin: padding;

+	-moz-background-origin: padding;

 	padding: 3px 15px;

 	-webkit-border-radius: 10px;

 	-moz-border-radius: 10px;

@@ -25,6 +27,9 @@
 	min-height: 16px;

 	}

 

+.v-button-caption {

+	color: #464f52;

+	}

 

 /* Small style */

 

diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index e147af60bf..739d089c85 100644
--- a/WebContent/VAADIN/themes/runo/styles.css
+++ b/WebContent/VAADIN/themes/runo/styles.css
@@ -1498,26 +1498,25 @@ div.v-tree-node-leaf {
 
 .v-upload-immediate {
 	position: relative;
-	width: 10em;
-	margin:0;
-	overflow:hidden;
+	margin: 0;
+	overflow: hidden;
 }
 
 .v-upload-immediate input {
 	opacity: 0;
 	filter: alpha(opacity=0);
-	z-index:2;
+	z-index: 2;
 	position: absolute;
-	right:0;
-	height:21px;
+	right: 0;
+	height: 21px;
 	text-align: right;
 }
 .v-upload-immediate button {
-	position:relative;
-	left:0;
-	top:0;
-	width:100%;
-	text-align:left;
+	position: relative;
+	left: 0;
+	top: 0;
+	width: 100%;
+	text-align: left;
 }
   
 
@@ -1724,6 +1723,8 @@ div.v-tree-node-leaf {
 	border: 1px solid #babfc0;
 	border-bottom-color: #a5abac;
 	background: #fff url(button/img/bg.png);
+	-webkit-background-origin: padding;
+	-moz-background-origin: padding;
 	padding: 3px 15px;
 	-webkit-border-radius: 10px;
 	-moz-border-radius: 10px;
@@ -1733,6 +1734,9 @@ div.v-tree-node-leaf {
 	min-height: 16px;
 	}
 
+.v-button-caption {
+	color: #464f52;
+	}
 
 /* Small style */