From 0a4f4ca7514ec8abfae07838ecab9b0a9d0c1a71 Mon Sep 17 00:00:00 2001 From: Andy Cochran Date: Mon, 4 Apr 2016 14:16:26 -0400 Subject: [PATCH] redo clobbered non-flex Button Group styles --- scss/components/_button-group.scss | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) 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; } } } -- 2.47.2