From f6c8f3f9939fb0f6acee6d60336d5f947110f736 Mon Sep 17 00:00:00 2001 From: "Manu Mtz.-Almeida" Date: Tue, 24 Jul 2018 00:48:03 +0200 Subject: [PATCH] fix(margin): adds css variables fixes #14798 fixes #14826 --- core/src/css/padding.scss | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/core/src/css/padding.scss b/core/src/css/padding.scss index 4951445326..8b44e73be2 100644 --- a/core/src/css/padding.scss +++ b/core/src/css/padding.scss @@ -74,43 +74,58 @@ $margin: var(--ion-margin, 16px); // -------------------------------------------------- [no-margin] { + --margin-start: 0; + --margin-end: 0; + --margin-top: 0; + --margin-bottom: 0; + @include margin(0); } [margin] { + --margin-start: #{$margin}; + --margin-end: #{$margin}; + --margin-top: #{$margin}; + --margin-bottom: #{$margin}; + @include margin($margin); } [margin-top] { + --margin-top: #{$margin}; + @include margin($margin, null, null, null); } -[margin-left] { - /* stylelint-disable-next-line property-blacklist */ - margin-left: $margin; -} [margin-start] { + --margin-start: #{$margin}; + @include margin-horizontal($margin, null); } -[margin-right] { - /* stylelint-disable-next-line property-blacklist */ - margin-right: $margin; -} - [margin-end] { + --margin-end: #{$margin}; + @include margin-horizontal(null, $margin); } [margin-bottom] { + --margin-bottom: #{$margin}; + @include margin(null, null, $margin, null); } [margin-vertical] { + --margin-top: #{$margin}; + --margin-bottom: #{$margin}; + @include margin($margin, null, $margin, null); } [margin-horizontal] { + --margin-start: #{$margin}; + --margin-end: #{$margin}; + @include margin-horizontal($margin); }