From: Andy Cochran <acochran@planning.nyc.gov>
Date: Fri, 6 Jul 2018 20:27:06 +0000 (+0200)
Subject: Use pull request #11104 from zurb/andycochran/8833-input-group-label-radius for v6.5.0
X-Git-Tag: v6.5.0-rc.2^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1080d97eead6d98fed8d871509fd2267348109bd;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

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 f74013c8c..46669e9da 100644
--- 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);
       }
     }