From 6a2a22e1c042a98d742a49fcc1c0858c4f870446 Mon Sep 17 00:00:00 2001 From: Brett Mason Date: Thu, 3 Nov 2016 20:12:20 +0000 Subject: [PATCH] Re-organise properties to match correct property order standards. Fix Travis error. Finish flexbox styles. --- scss/components/_card.scss | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/scss/components/_card.scss b/scss/components/_card.scss index a819b94ff..280f40a2d 100644 --- a/scss/components/_card.scss +++ b/scss/components/_card.scss @@ -51,21 +51,24 @@ $card-margin: $global-margin !default; $margin: $card-margin, $border: $card-border, $radius: $card-border-radius, - $shadow: $card-shadow, + $shadow: $card-shadow ) { + @if $global-flexbox { + display: flex; + flex-direction: column; + } + + margin-bottom: $margin; + border: $border; border-radius: $radius; - box-shadow: $shadow; - margin-bottom: $margin; + background: $background; + box-shadow: $shadow; + overflow: hidden; color: $card-font-color; - @if $global-flexbox { - display: flex; - flex-direction: column; - } - & > :last-child { margin-bottom: 0; } @@ -76,13 +79,13 @@ $card-margin: $global-margin !default; $background: $card-divider-background, $padding: $card-padding ) { - background: $background; - padding: $padding; - @if $global-flexbox { - flex-grow: 1; + flex: 0 1 auto; } + padding: $padding; + background: $background; + & > :last-child { margin-bottom: 0; } @@ -92,12 +95,12 @@ $card-margin: $global-margin !default; @mixin card-section( $padding: $card-padding ) { - padding: $padding; - @if $global-flexbox { - flex-grow: 1; + flex: 1 0 auto; } + padding: $padding; + & > :last-child { margin-bottom: 0; } -- 2.47.2