From: Chris Rebert <code@chrisrebert.com>
Date: Fri, 4 Dec 2015 09:42:18 +0000 (-0800)
Subject: Use $border-width for .btn-group margins that make borders overlap
X-Git-Tag: v4.0.0-alpha.2~73^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F18427%2Fhead;p=thirdparty%2Fbootstrap.git

Use $border-width for .btn-group margins that make borders overlap

Fixes half of #18425
[skip sauce]
[skip validator]
---

diff --git a/scss/_button-group.scss b/scss/_button-group.scss
index d85c637679..7eebd380ba 100644
--- a/scss/_button-group.scss
+++ b/scss/_button-group.scss
@@ -27,7 +27,7 @@
   .btn + .btn-group,
   .btn-group + .btn,
   .btn-group + .btn-group {
-    margin-left: -1px;
+    margin-left: -$border-width;
   }
 }
 
@@ -167,7 +167,7 @@
   > .btn + .btn-group,
   > .btn-group + .btn,
   > .btn-group + .btn-group {
-    margin-top: -1px;
+    margin-top: -$border-width;
     margin-left: 0;
   }
 }