From: Jouni Koivuviita <jouni@vaadin.com>
Date: Fri, 15 Aug 2014 09:23:49 +0000 (+0300)
Subject: Remove unnecessary negative border radius declarations from menu bar (Valo)
X-Git-Tag: 7.3.0.rc1~10^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e75aa11368629324e0f06708cce12a4d7d4e8d9c;p=vaadin-framework.git

Remove unnecessary negative border radius declarations from menu bar (Valo)

Change-Id: I3739cdacf6a117cd0d75cab3566a82ee0fedd6bd
---

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 {