Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <markd.otto@gmail.com>2022-02-15 02:07:17 +0300
committerGitHub <noreply@github.com>2022-02-15 02:07:17 +0300
commit918a86b42528ec8f7f5d6df71851ab2ec0bc65e7 (patch)
tree39c2415ab48606f37122f3d34294bfd2c0c51cab
parenta163ed76d4a0ebd30405f9b351a44497ae7778e1 (diff)
Correct the horizontal padding on grid containers (#35825)
* Correct the horizontal padding on grid containers * Don't halve the container-padding-x variable
-rw-r--r--scss/_variables.scss2
-rw-r--r--scss/mixins/_container.scss4
2 files changed, 3 insertions, 3 deletions
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 0485ffe7c5..19e3722ffd 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -467,7 +467,7 @@ $grid-row-columns: 6 !default;
// Container padding
-$container-padding-x: $grid-gutter-width * .5 !default;
+$container-padding-x: $grid-gutter-width !default;
// Components
diff --git a/scss/mixins/_container.scss b/scss/mixins/_container.scss
index 5553042637..63fddfc1d0 100644
--- a/scss/mixins/_container.scss
+++ b/scss/mixins/_container.scss
@@ -4,8 +4,8 @@
--#{$variable-prefix}gutter-x: #{$gutter};
--#{$variable-prefix}gutter-y: 0;
width: 100%;
- padding-right: var(--#{$variable-prefix}gutter-x, #{$gutter});
- padding-left: var(--#{$variable-prefix}gutter-x, #{$gutter});
+ padding-right: calc(var(--#{$variable-prefix}gutter-x) * .5); // stylelint-disable-line function-disallowed-list
+ padding-left: calc(var(--#{$variable-prefix}gutter-x) * .5); // stylelint-disable-line function-disallowed-list
margin-right: auto;
margin-left: auto;
}