Fix #11400 and #11431

1 files changed, 21 insertions, 11 deletions

diff --git a/less/input-groups.less b/less/input-groups.less
index 8516a79e9..a70decc58 100644
--- a/less/input-groups.less
+++ b/less/input-groups.less
@@ -121,16 +121,26 @@
   &:last-child > .btn {
     margin-left: -1px;
   }
-}
-.input-group-btn > .btn {
-  position: relative;
-  // Jankily prevent input button groups from wrapping
-  + .btn {
-    margin-left: -4px;
-  }
-  // Bring the "active" button to the front
-  &:hover,
-  &:active {
-    z-index: 2;
+
+  > .btn {
+    position: relative;
+
+    &:not(:first-of-type):not(:last-of-type) {
+      border-radius: 0;
+    }
+
+    // Jankily prevent input button groups from wrapping
+    + .btn {
+      margin-left: -4px;
+    }
+    + .btn:last-of-type {
+      margin-left: -5px;
+    }
+
+    // Bring the "active" button to the front
+    &:hover,
+    &:active {
+      z-index: 2;
+    }
   }
 }