From: Brett Mason <brettsmason@gmail.com>
Date: Thu, 3 Nov 2016 20:12:20 +0000 (+0000)
Subject: Re-organise properties to match correct property order standards. Fix Travis error... 
X-Git-Tag: v6.3-rc1~38^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9215%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Re-organise properties to match correct property order standards. Fix Travis error. Finish flexbox styles.
---

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;
   }