From 96cea1dc86a8fcb071bdcb1f08efb635bd6fc37f Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Wed, 27 Jun 2018 08:09:51 +1000 Subject: [PATCH] Fixed Tabs, added flex-basis mixin --- public/styles/tools/flex.scss | 66 ++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 29 deletions(-) diff --git a/public/styles/tools/flex.scss b/public/styles/tools/flex.scss index a1ef879..196053c 100644 --- a/public/styles/tools/flex.scss +++ b/public/styles/tools/flex.scss @@ -6,7 +6,7 @@ * https://github.com/mastastealth/sass-flex-mixin/blob/master/_flex.scss * * Version: - * 1.0.0 - 2018/02/23 + * 1.0.1 - 2018/06/27 */ //Flex/Flexbox @@ -71,17 +71,17 @@ //Align content @mixin t-align-content($value: stretch) { - // No Webkit Box Fallback. - -webkit-align-content: $value; - -moz-align-content: $value; - @if $value == flex-start { - -ms-flex-line-pack: start; - } @else if $value == flex-end { - -ms-flex-line-pack: end; - } @else { - -ms-flex-line-pack: $value; - } - align-content: $value; + // No Webkit Box Fallback. + -webkit-align-content: $value; + -moz-align-content: $value; + @if $value == flex-start { + -ms-flex-line-pack: start; + } @else if $value == flex-end { + -ms-flex-line-pack: end; + } @else { + -ms-flex-line-pack: $value; + } + align-content: $value; } //Justify Content @@ -130,23 +130,23 @@ //t-flex-direction @mixin t-flex-direction($value: row) { - @if $value == row-reverse { - -webkit-box-direction: reverse; - -webkit-box-orient: horizontal; - } @else if $value == column { - -webkit-box-direction: normal; - -webkit-box-orient: vertical; - } @else if $value == column-reverse { - -webkit-box-direction: reverse; - -webkit-box-orient: vertical; - } @else { - -webkit-box-direction: normal; - -webkit-box-orient: horizontal; - } - -webkit-flex-direction: $value; - -moz-flex-direction: $value; - -ms-flex-direction: $value; - flex-direction: $value; + @if $value == row-reverse { + -webkit-box-direction: reverse; + -webkit-box-orient: horizontal; + } @else if $value == column { + -webkit-box-direction: normal; + -webkit-box-orient: vertical; + } @else if $value == column-reverse { + -webkit-box-direction: reverse; + -webkit-box-orient: vertical; + } @else { + -webkit-box-direction: normal; + -webkit-box-orient: horizontal; + } + -webkit-flex-direction: $value; + -moz-flex-direction: $value; + -ms-flex-direction: $value; + flex-direction: $value; } //Flex Grow @@ -157,3 +157,11 @@ -ms-flex-positive: $int; flex-grow: $int; } + +//Flex basis +@mixin t-flex-basis($value: auto) { + -webkit-flex-basis: $value; + -moz-flex-basis: $value; + -ms-flex-preferred-size: $value; + flex-basis: $value; +}