summaryrefslogtreecommitdiffstats
path: root/themes
diff options
context:
space:
mode:
authorArtur <artur@vaadin.com>2017-03-13 15:47:15 +0200
committerPekka Hyvönen <pekka@vaadin.com>2017-03-13 15:47:15 +0200
commit6c567a4ef5b8e1c9b13876a0a2df6c117d2adf59 (patch)
tree6b4d89d9a6ea35ac9f5c77c6160aae1fd67254d9 /themes
parentdcb611d2e2b0adaf3e856f02725ab6672ab0ede1 (diff)
downloadvaadin-framework-6c567a4ef5b8e1c9b13876a0a2df6c117d2adf59.tar.gz
vaadin-framework-6c567a4ef5b8e1c9b13876a0a2df6c117d2adf59.zip
Correctly adjust upload button borders inside a component group (#8817)
* Correctly adjust upload button borders inside a component group
Diffstat (limited to 'themes')
-rw-r--r--themes/src/main/themes/VAADIN/themes/valo/components/_csslayout.scss17
1 files changed, 17 insertions, 0 deletions
diff --git a/themes/src/main/themes/VAADIN/themes/valo/components/_csslayout.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_csslayout.scss
index c06d3c2441..6e8204aeb0 100644
--- a/themes/src/main/themes/VAADIN/themes/valo/components/_csslayout.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_csslayout.scss
@@ -53,25 +53,42 @@ $v-component-group-spacing: null !default;
@if $v-border-radius > 0 {
.v-widget ~ .v-widget:not(:last-child) {
border-radius: 0;
+ &.v-upload .v-button {
+ border-radius: 0;
+ }
}
.v-widget:last-child {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
+ &.v-upload .v-button {
+ border-top-left-radius: 0;
+ border-bottom-left-radius: 0;
+ }
}
.v-widget:first-child,
.v-caption:first-child + .v-widget {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
+ &.v-upload .v-button {
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
+ }
}
.v-widget ~ .v-widget.first.first {
border-radius: $v-border-radius 0 0 $v-border-radius;
+ &.v-upload .v-button {
+ border-radius: $v-border-radius 0 0 $v-border-radius;
+ }
}
.v-widget ~ .v-widget.last.last {
border-radius: 0 $v-border-radius $v-border-radius 0;
+ &.v-upload .v-button {
+ border-radius: 0 $v-border-radius $v-border-radius 0;
+ }
}
}