]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Simplify make-container() (#31735)
authorGaël Poupard <ffoodd@users.noreply.github.com>
Sat, 14 Nov 2020 13:33:10 +0000 (14:33 +0100)
committerGitHub <noreply@github.com>
Sat, 14 Nov 2020 13:33:10 +0000 (14:33 +0100)
scss/_variables.scss
scss/mixins/_container.scss

index 0b64330e967690b26599e66a5ec70609576e48aa..31c0a1fae24dfdb88dab8d4f86495659edd36ea0 100644 (file)
@@ -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
index f391c220cb1325b2d8311505e5809b9d6f27d53f..f92fcec68b6bfadd72fc9b383c15cb6275954aa7 100644 (file)
@@ -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;
 }