From: Andy Cochran <acochran@council.nyc.gov>
Date: Mon, 4 Apr 2016 18:16:26 +0000 (-0400)
Subject: redo clobbered non-flex Button Group styles
X-Git-Tag: v6.2.1~17^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8525%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

redo clobbered non-flex Button Group styles
---

diff --git a/scss/components/_button-group.scss b/scss/components/_button-group.scss
index ea95e38b2..b43ba1861 100644
--- a/scss/components/_button-group.scss
+++ b/scss/components/_button-group.scss
@@ -29,13 +29,15 @@ $buttongroup-expand-max: 6 !default;
 ) {
   @include clearfix;
   margin-bottom: $buttongroup-margin;
-  font-size: 0;
 
   @if $global-flexbox {
     display: flex;
     flex-wrap: nowrap;
     align-items: stretch;
   }
+  @else {
+    font-size: 0;
+  }
 
   #{$child-selector} {
     margin: 0;
@@ -44,17 +46,9 @@ $buttongroup-expand-max: 6 !default;
     @if $global-flexbox {
       flex: 0 0 auto;
     }
-    @else {
-      float: #{$global-left};
-    }
 
     &:not(:last-child) {
-      @if $global-flexbox {
-        margin-right: $buttongroup-spacing;
-      }
-      @else {
-        border-#{$global-right}: $buttongroup-spacing solid $body-background;
-      }
+      margin-right: $buttongroup-spacing;
     }
   }
 }