summaryrefslogtreecommitdiffstats
path: root/WebContent
diff options
context:
space:
mode:
authorSauli Tähkäpää <sauli@vaadin.com>2014-10-30 16:11:10 +0200
committerVaadin Code Review <review@vaadin.com>2014-11-03 09:39:36 +0000
commit77bb7ac886bd9f82e5295323254cd9fbb8ea8a10 (patch)
tree80d6898938b8ce0385131108db419791152e5d69 /WebContent
parent4910442a87c35ca3b1240d2818e4155522b04504 (diff)
downloadvaadin-framework-77bb7ac886bd9f82e5295323254cd9fbb8ea8a10.tar.gz
vaadin-framework-77bb7ac886bd9f82e5295323254cd9fbb8ea8a10.zip
Set upload button width to 100% when immediate on Valo. (#14485)
Change-Id: I473fc080c143bc242326bd6f2b819450c42ffae5
Diffstat (limited to 'WebContent')
-rw-r--r--WebContent/VAADIN/themes/base/upload/upload.scss5
-rw-r--r--WebContent/VAADIN/themes/valo/components/_upload.scss8
2 files changed, 8 insertions, 5 deletions
diff --git a/WebContent/VAADIN/themes/base/upload/upload.scss b/WebContent/VAADIN/themes/base/upload/upload.scss
index e705fc1c78..f8e707446c 100644
--- a/WebContent/VAADIN/themes/base/upload/upload.scss
+++ b/WebContent/VAADIN/themes/base/upload/upload.scss
@@ -4,12 +4,11 @@
white-space: nowrap;
}
-
.#{$primaryStyleName}-immediate {
position: relative;
margin: 0;
overflow: hidden;
- .v-button{
+ .v-button {
width:100%;
}
}
@@ -39,4 +38,4 @@
text-align: left;
}
-} \ No newline at end of file
+}
diff --git a/WebContent/VAADIN/themes/valo/components/_upload.scss b/WebContent/VAADIN/themes/valo/components/_upload.scss
index c301be060a..07a51f03ef 100644
--- a/WebContent/VAADIN/themes/valo/components/_upload.scss
+++ b/WebContent/VAADIN/themes/valo/components/_upload.scss
@@ -1,7 +1,7 @@
/**
*
*
- * @param {string} $primary-stylename (v-upload) -
+ * @param {string} $primary-stylename (v-upload) -
*
* @group upload
*/
@@ -10,6 +10,10 @@
@include valo-widget-style;
}
+ .#{$primary-stylename}-immediate .v-button {
+ width: 100%;
+ }
+
.#{$primary-stylename}-immediate input[type="file"] {
@include opacity(0);
z-index: 2;
@@ -20,4 +24,4 @@
border: none;
background: transparent;
}
-} \ No newline at end of file
+}