redo clobbered non-flex Button Group styles

diff --git a/scss/components/_button-group.scss b/scss/components/_button-group.scss
index ea95e38b214b3dfb04f7c9d8bb8007c1937307c8..b43ba1861eaeb7fa951f179f903e858cebfad235 100644 (file)
--- 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;
     }
   }
 }