Use pull request #11104 from zurb/andycochran/8833-input-group-label-radius for v6.5.0

8081d51c0 fix radius on input-group-label and input-group-button
713b54178 dry input-group scss
d267df4b9 refactor: simplify Input Group border-radius selector

Co-Authored-By: Nicolas Coden <nicolas@ncoden.fr>
Signed-off-by: Nicolas Coden <nicolas@ncoden.fr>

diff --git a/scss/forms/_input-group.scss b/scss/forms/_input-group.scss
index f74013c8caecf3bca382b0afb271dae6668a81d6..46669e9da075d59d747cd60560c2581aad04ca55 100644 (file)
--- a/scss/forms/_input-group.scss
+++ b/scss/forms/_input-group.scss
@@ -34,11 +34,13 @@ $input-prefix-padding: 1rem !default;
     }
 
     > :first-child {
-      border-radius: if($global-text-direction == rtl, 0 $input-radius $input-radius 0, $input-radius 0 0 $input-radius);
+      &, &.input-group-button > * {
+        border-radius: if($global-text-direction == rtl, 0 $input-radius $input-radius 0, $input-radius 0 0 $input-radius);
+      }
     }
 
     > :last-child {
-      > * {
+      &, &.input-group-button > * {
         border-radius: if($global-text-direction == rtl, $input-radius 0 0 $input-radius, 0 $input-radius $input-radius 0);
       }
     }