From: Harry Manchanda <harmanmanchanda182@gmail.com>
Date: Tue, 4 Jul 2017 18:30:50 +0000 (+0530)
Subject: Merge pull request #10341 from LeoColomb/patch-2
X-Git-Tag: v6.4.2-rc1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71b1251272f5ca84445aa1b59f63d218daceaf2b;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge pull request #10341 from LeoColomb/patch-2

Remove `flex-grid-column()` duplicate `max-width`
---

diff --git a/scss/grid/_flex-grid.scss b/scss/grid/_flex-grid.scss
index 31012424b..61a6d2dae 100644
--- a/scss/grid/_flex-grid.scss
+++ b/scss/grid/_flex-grid.scss
@@ -88,10 +88,6 @@
   @if $columns == expand {
     min-width: 0;
   }
-  // max-width fixes IE 10/11 not respecting the flex-basis property
-  @if $columns != expand and $columns != shrink {
-    max-width: grid-column($columns);
-  }
 }
 
 /// Creates a block grid for a flex grid row.