From 54ac2c7b055e66b8dae38667f3573491f2389d27 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Mon, 14 Sep 2020 09:58:48 -0700
Subject: [PATCH] Match container gutters with row gutters

- Replaces make-container mixin's padding-x param with gutter to match naming
- Changes value of container padding variable to match grid gutter width variable
- Uses local CSS variable for container padding

Fixes #31642
---
 scss/_variables.scss        | 2 +-
 scss/mixins/_container.scss | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 6950af95c8..dbf4c52750 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -336,7 +336,7 @@ $gutters: $spacers !default;
 
 // Container padding
 
-$container-padding-x: 1rem !default;
+$container-padding-x: $grid-gutter-width !default;
 
 
 // Components
diff --git a/scss/mixins/_container.scss b/scss/mixins/_container.scss
index 435d003410..3680b3098d 100644
--- a/scss/mixins/_container.scss
+++ b/scss/mixins/_container.scss
@@ -1,9 +1,11 @@
 // Container mixins
 
-@mixin make-container($padding-x: $container-padding-x) {
+@mixin make-container($gutter: $container-padding-x) {
+  --bs-gutter-x: #{$gutter};
+
   width: 100%;
-  padding-right: $padding-x;
-  padding-left: $padding-x;
+  padding-right: var(--bs-gutter-x);
+  padding-left: var(--bs-gutter-x);
   margin-right: auto;
   margin-left: auto;
 }