Alternative fix to double border

1 files changed, 11 insertions, 4 deletions

diff --git a/scss/_input-group.scss b/scss/_input-group.scss
index e068ffa3f..f514481cd 100644
--- a/scss/_input-group.scss
+++ b/scss/_input-group.scss
@@ -128,6 +128,9 @@
 .input-group-btn:not(:first-child) > .btn-group:not(:last-child) > .btn {
   @include border-right-radius(0);
 }
+.input-group-addon:not(:last-child) {
+  border-right: 0;
+}
 .input-group .form-control:not(:first-child),
 .input-group-addon:not(:first-child),
 .input-group-btn:not(:first-child) > .btn,
@@ -137,12 +140,10 @@
 .input-group-btn:not(:last-child) > .btn-group:not(:first-child) > .btn {
   @include border-left-radius(0);
 }
-.input-group .form-control:not(:first-child),
-.input-group-addon:not(:first-child) {
+.form-control + .input-group-addon:not(:first-child) {
   border-left: 0;
 }
 
-
 //
 // Button input groups
 //
@@ -168,11 +169,17 @@
   }
 
   // Negative margin to only have a single, shared border between the two
+  &:not(:last-child) {
+    > .btn,
+    > .btn-group {
+      margin-right: (-$input-btn-border-width);
+    }
+  }
   &:not(:first-child) {
     > .btn,
     > .btn-group {
       z-index: 2;
-      margin-left: (-$input-btn-border-width) * 2;
+      margin-left: (-$input-btn-border-width);
       // Because specificity
       @include hover-focus-active {
         z-index: 3;