aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2016-02-17 03:19:07 -0800
committerChris Rebert <[email protected]>2016-02-17 03:19:07 -0800
commit43d0d45d0ac49bf969da42688c2b2e1f6aa59e9c (patch)
tree3d5a4cdd65f7f74b08483fe717f35b0b4f68f2ff
parentc1eb92a041cdf337112641a52ad5ccb3078cc638 (diff)
downloadbootstrap-43d0d45d0ac49bf969da42688c2b2e1f6aa59e9c.tar.xz
bootstrap-43d0d45d0ac49bf969da42688c2b2e1f6aa59e9c.zip
Add $gutter parameter to make-col mixin; fixes #19147
[skip sauce] [skip validator]
-rw-r--r--scss/mixins/_grid-framework.scss2
-rw-r--r--scss/mixins/_grid.scss6
2 files changed, 4 insertions, 4 deletions
diff --git a/scss/mixins/_grid-framework.scss b/scss/mixins/_grid-framework.scss
index 93a3a8707..dcdec8000 100644
--- a/scss/mixins/_grid-framework.scss
+++ b/scss/mixins/_grid-framework.scss
@@ -22,7 +22,7 @@
@for $i from 1 through $columns {
.col-#{$breakpoint}-#{$i} {
- @include make-col($i, $columns);
+ @include make-col($i, $columns, $gutter);
}
}
diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index 6e67f92cd..3ba4f43bc 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -33,11 +33,11 @@
margin-right: ($gutter / -2);
}
-@mixin make-col($size, $columns: $grid-columns) {
+@mixin make-col($size, $columns: $grid-columns, $gutter: $grid-gutter-width) {
position: relative;
min-height: 1px;
- padding-right: ($grid-gutter-width / 2);
- padding-left: ($grid-gutter-width / 2);
+ padding-right: ($gutter / 2);
+ padding-left: ($gutter / 2);
@if $enable-flex {
flex: 0 0 percentage($size / $columns);