From: Gaël Poupard <ffoodd@users.noreply.github.com>
Date: Sat, 14 Nov 2020 13:33:10 +0000 (+0100)
Subject: Simplify make-container() (#31735)
X-Git-Tag: v5.0.0-beta1~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44fef1677b0ad9599040b56125ccd58c41c3fdd8;p=thirdparty%2Fbootstrap.git

Simplify make-container() (#31735)
---

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 0b64330e96..31c0a1fae2 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -337,7 +337,7 @@ $gutters: $spacers !default;
 
 // Container padding
 
-$container-padding-x: $grid-gutter-width !default;
+$container-padding-x: $grid-gutter-width / 2 !default;
 
 
 // Components
diff --git a/scss/mixins/_container.scss b/scss/mixins/_container.scss
index f391c220cb..f92fcec68b 100644
--- a/scss/mixins/_container.scss
+++ b/scss/mixins/_container.scss
@@ -1,11 +1,9 @@
 // Container mixins
 
 @mixin make-container($gutter: $container-padding-x) {
-  --bs-gutter-x: #{$gutter};
-
   width: 100%;
-  padding-right: calc(var(--bs-gutter-x) / 2); // stylelint-disable-line function-disallowed-list
-  padding-left: calc(var(--bs-gutter-x) / 2); // stylelint-disable-line function-disallowed-list
+  padding-right: var(--bs-gutter-x, #{$gutter});
+  padding-left: var(--bs-gutter-x, #{$gutter});
   margin-right: auto;
   margin-left: auto;
 }