summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--WebContent/VAADIN/themes/valo/components/_menubar.scss18
1 files changed, 11 insertions, 7 deletions
diff --git a/WebContent/VAADIN/themes/valo/components/_menubar.scss b/WebContent/VAADIN/themes/valo/components/_menubar.scss
index 7d7e854989..f03bc3d022 100644
--- a/WebContent/VAADIN/themes/valo/components/_menubar.scss
+++ b/WebContent/VAADIN/themes/valo/components/_menubar.scss
@@ -126,21 +126,25 @@
margin-right: 1px;
}
- $br: $v-border-radius - $border-width - 1px;
+ $br: max(0, $v-border-radius - $border-width);
&:first-child {
border-left-width: 0;
- border-radius: $br 0 0 $br;
+ @if $v-border-radius > 0 {
+ border-radius: $br 0 0 $br;
+ }
}
&:last-child {
- border-radius: 0 $br $br 0;
- margin-right: -$border-width;
+ @if $v-border-radius > 0 {
+ border-radius: 0 $br $br 0;
+ }
+ border-right-width: 0;
}
&:first-child:last-child {
- border-radius: $br;
- border-right-width: 0;
- margin-right: 0;
+ @if $v-border-radius > 0 {
+ border-radius: $br;
+ }
}
&:before {