aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaĆ«l Poupard <[email protected]>2020-11-14 14:33:10 +0100
committerGitHub <[email protected]>2020-11-14 14:33:10 +0100
commit44fef1677b0ad9599040b56125ccd58c41c3fdd8 (patch)
tree38539107c4f4744d3076dd3690fb397d0e0a6bf8
parent4f8b243ac1a7ccd13c6bb485463ae365010d2620 (diff)
downloadbootstrap-44fef1677b0ad9599040b56125ccd58c41c3fdd8.tar.xz
bootstrap-44fef1677b0ad9599040b56125ccd58c41c3fdd8.zip
Simplify make-container() (#31735)
-rw-r--r--scss/_variables.scss2
-rw-r--r--scss/mixins/_container.scss6
2 files changed, 3 insertions, 5 deletions
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 0b64330e9..31c0a1fae 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 f391c220c..f92fcec68 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;
}