From c3abf1c2f5df7b74c7071367e4e098c78e5fe1f9 Mon Sep 17 00:00:00 2001 From: kyletsang <6854874+kyletsang@users.noreply.github.com> Date: Tue, 21 Sep 2021 08:38:37 -0700 Subject: [PATCH 1/2] Add workaround for dart sass compile error --- scss/mixins/_grid.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss index 59cc5637626f..353a5a4d1da3 100644 --- a/scss/mixins/_grid.scss +++ b/scss/mixins/_grid.scss @@ -7,9 +7,9 @@ --#{$variable-prefix}gutter-y: 0; display: flex; flex-wrap: wrap; - margin-top: calc(var(--#{$variable-prefix}gutter-y) * -1); // stylelint-disable-line function-disallowed-list - margin-right: calc(var(--#{$variable-prefix}gutter-x) * -.5); // stylelint-disable-line function-disallowed-list - margin-left: calc(var(--#{$variable-prefix}gutter-x) * -.5); // stylelint-disable-line function-disallowed-list + margin-top: calc(-1 * var(--#{$variable-prefix}gutter-y)); // stylelint-disable-line function-disallowed-list + margin-right: calc(-.5 * var(--#{$variable-prefix}gutter-x)); // stylelint-disable-line function-disallowed-list + margin-left: calc(-.5 * var(--#{$variable-prefix}gutter-x)); // stylelint-disable-line function-disallowed-list } @mixin make-col-ready($gutter: $grid-gutter-width) { From 46ca25f3b669dd24634c9ab58a7cb468f34513d4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 5 Oct 2021 08:36:39 -0700 Subject: [PATCH 2/2] Update _grid.scss --- scss/mixins/_grid.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss index 353a5a4d1da3..aea51abaf6eb 100644 --- a/scss/mixins/_grid.scss +++ b/scss/mixins/_grid.scss @@ -7,6 +7,7 @@ --#{$variable-prefix}gutter-y: 0; display: flex; flex-wrap: wrap; + // TODO: Revisit calc order after https://github.com/react-bootstrap/react-bootstrap/issues/6039 is fixed margin-top: calc(-1 * var(--#{$variable-prefix}gutter-y)); // stylelint-disable-line function-disallowed-list margin-right: calc(-.5 * var(--#{$variable-prefix}gutter-x)); // stylelint-disable-line function-disallowed-list margin-left: calc(-.5 * var(--#{$variable-prefix}gutter-x)); // stylelint-disable-line function-disallowed-list