aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2020-09-14 09:58:48 -0700
committerMark Otto <[email protected]>2020-09-23 13:30:54 -0700
commit54ac2c7b055e66b8dae38667f3573491f2389d27 (patch)
tree0bbc7b25f2b87a23db606c127b5d29add25ccefd
parent9f60659d1dda28146e1c5cb6fe5a3e2b0d42b266 (diff)
downloadbootstrap-54ac2c7b055e66b8dae38667f3573491f2389d27.tar.xz
bootstrap-54ac2c7b055e66b8dae38667f3573491f2389d27.zip
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
-rw-r--r--scss/_variables.scss2
-rw-r--r--scss/mixins/_container.scss8
2 files changed, 6 insertions, 4 deletions
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 6950af95c..dbf4c5275 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 435d00341..3680b3098 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;
}