aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-06-29 21:35:07 -0700
committerMark Otto <[email protected]>2017-06-30 09:01:39 -0700
commitd30b5b120e6284b868840de0a63b1a401c581345 (patch)
treed4c7526892f503b06a3590a1000fe94c2ba43316
parente47cc747f6c672aa433eb81248b86e0d0f31965d (diff)
downloadbootstrap-d30b5b120e6284b868840de0a63b1a401c581345.tar.xz
bootstrap-d30b5b120e6284b868840de0a63b1a401c581345.zip
remove unused mixin, fix variable
-rw-r--r--scss/mixins/_grid-framework.scss6
-rw-r--r--scss/mixins/_grid.scss10
2 files changed, 3 insertions, 13 deletions
diff --git a/scss/mixins/_grid-framework.scss b/scss/mixins/_grid-framework.scss
index f5598b589..236aadf0c 100644
--- a/scss/mixins/_grid-framework.scss
+++ b/scss/mixins/_grid-framework.scss
@@ -3,14 +3,14 @@
// Used only by Bootstrap to generate the correct number of grid classes given
// any value of `$grid-columns`.
-@mixin make-grid-columns($columns: $grid-columns, $gutters: $grid-gutter-widths, $breakpoints: $grid-breakpoints) {
+@mixin make-grid-columns($columns: $grid-columns, $gutter: $grid-gutter-width, $breakpoints: $grid-breakpoints) {
// Common properties for all breakpoints
%grid-column {
position: relative;
width: 100%;
min-height: 1px; // Prevent columns from collapsing when empty
- padding-right: ($grid-gutter-width / 2);
- padding-left: ($grid-gutter-width / 2);
+ padding-right: ($gutter / 2);
+ padding-left: ($gutter / 2);
}
@each $breakpoint in map-keys($breakpoints) {
diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index 7ed93c738..25bdc74d4 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -20,16 +20,6 @@
}
}
-// @mixin make-gutters($gutters: $grid-gutter-widths) {
-// @each $breakpoint in map-keys($gutters) {
-// @include media-breakpoint-up($breakpoint) {
-// $gutter: map-get($gutters, $breakpoint);
-// padding-right: ($gutter / 2);
-// padding-left: ($gutter / 2);
-// }
-// }
-// }
-
@mixin make-row() {
display: flex;
flex-wrap: wrap;