aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-10-24 21:49:26 -0700
committerGitHub <[email protected]>2016-10-24 21:49:26 -0700
commita3bc24abc42a608444283f1010f6b0495be010e7 (patch)
tree21f95f9f3a538ed7dd5515f98bbc33beb8063daa
parent73154d039252e1eb8318c885770f020d6d410cf4 (diff)
parente1fefe60656d6e99415328b9e0b40b336ce9909e (diff)
downloadbootstrap-a3bc24abc42a608444283f1010f6b0495be010e7.tar.xz
bootstrap-a3bc24abc42a608444283f1010f6b0495be010e7.zip
Merge pull request #20973 from pixelbandito/container-gutter-breakpoints
Container padding uses per-breakpoint gutter sizes, fixes #19304.
-rw-r--r--scss/mixins/_grid.scss12
1 files changed, 9 insertions, 3 deletions
diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index 88cbd249a..402a99e92 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -2,14 +2,20 @@
//
// Generate semantic grid columns with these mixins.
-@mixin make-container($gutter: $grid-gutter-width-base) {
+@mixin make-container($gutters: $grid-gutter-widths) {
margin-left: auto;
margin-right: auto;
- padding-left: ($gutter / 2);
- padding-right: ($gutter / 2);
@if not $enable-flex {
@include clearfix();
}
+
+ @each $breakpoint in map-keys($gutters) {
+ @include media-breakpoint-up($breakpoint) {
+ $gutter: map-get($gutters, $breakpoint);
+ padding-right: ($gutter / 2);
+ padding-left: ($gutter / 2);
+ }
+ }
}