From 75defcb1492b2202700246fd503e34e1bf7b36ed Mon Sep 17 00:00:00 2001 From: Lucas Bersier Date: Mon, 1 Oct 2018 20:58:11 -0400 Subject: [PATCH] fix(layout): Give Non-numeric flex values priority when media-dependent --- src/core/style/layout.scss | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/core/style/layout.scss b/src/core/style/layout.scss index f196017cde8..e5e4a1aa19d 100644 --- a/src/core/style/layout.scss +++ b/src/core/style/layout.scss @@ -121,6 +121,20 @@ .#{$flexName}-noshrink { flex: 1 0 auto; box-sizing: border-box; } .#{$flexName}-nogrow { flex: 0 1 auto; box-sizing: border-box; } + .layout-row > .#{$flexName}-grow { flex: 1 1 100%; box-sizing: border-box; } + .layout-row > .#{$flexName}-initial { flex: 0 1 auto; box-sizing: border-box; } + .layout-row > .#{$flexName}-auto { flex: 1 1 auto; box-sizing: border-box; } + .layout-row > .#{$flexName}-none { flex: 0 0 auto; box-sizing: border-box; } + .layout-row > .#{$flexName}-noshrink { flex: 1 0 auto; box-sizing: border-box; } + .layout-row > .#{$flexName}-nogrow { flex: 0 1 auto; box-sizing: border-box; } + + .layout-column > .#{$flexName}-grow { flex: 1 1 100%; box-sizing: border-box; } + .layout-column > .#{$flexName}-initial { flex: 0 1 auto; box-sizing: border-box; } + .layout-column > .#{$flexName}-auto { flex: 1 1 auto; box-sizing: border-box; } + .layout-column > .#{$flexName}-none { flex: 0 0 auto; box-sizing: border-box; } + .layout-column > .#{$flexName}-noshrink { flex: 1 0 auto; box-sizing: border-box; } + .layout-column > .#{$flexName}-nogrow { flex: 0 1 auto; box-sizing: border-box; } + // (1-20) * 5 = 0-100% @for $i from 0 through 20 { $value : #{$i * 5 + '%'};