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

svn changeset:8664/svn branch:6.1

diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index 40e7d93e48f588099f62939da9a7e26ca18c7e0a..9dffa473b3567cf881bcba55d2f8fc26e6ca0538 100644 (file)
--- 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 d9299ae65c1a4b05f26a8c29d20c2aca6bce13f1..73f9490738cf2a747087b3de8c4627d2014817e0 100644 (file)
--- 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 8f75bb11d4436ca0f0ddaf1c165a6b3a37f59aca..1cf162a7b681dcc00bade4b7b89972f8ce11a4fe 100644 (file)
--- 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 667c230f17bb492445a44ed8bfbde7299b848194..53762a03df6198ec525c3b863c265c10cbbd617d 100644 (file)
--- a/WebContent/VAADIN/themes/runo/button/button.css
+++ b/WebContent/VAADIN/themes/runo/button/button.css
@@ -16,6 +16,8 @@
        border: 1px solid #babfc0;\r
        border-bottom-color: #a5abac;\r
        background: #fff url(img/bg.png);\r
+       -webkit-background-origin: padding;\r
+       -moz-background-origin: padding;\r
        padding: 3px 15px;\r
        -webkit-border-radius: 10px;\r
        -moz-border-radius: 10px;\r
@@ -25,6 +27,9 @@
        min-height: 16px;\r
        }\r
 \r
+.v-button-caption {\r
+       color: #464f52;\r
+       }\r
 \r
 /* Small style */\r
 \r

diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index e147af60bf40729f37ab17532096b98becfe1fde..739d089c852dbd6593c24bfca1b40a97c9341147 100644 (file)
--- 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 */