diff options
| author | Chris Rebert <[email protected]> | 2016-01-13 23:47:32 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2016-01-13 23:47:32 -0800 |
| commit | 01c3f874e11ff561f2e2f8aabe408d3b9a44a52f (patch) | |
| tree | 1af4d92d76144c4bae51abe85c011220c59b515b | |
| parent | 6ff249791e3e959b01e1dd0a99ecdf76e68075f5 (diff) | |
| parent | 0762a1978c27a849f7bc68a8d6262017ab2bde98 (diff) | |
| download | bootstrap-01c3f874e11ff561f2e2f8aabe408d3b9a44a52f.tar.xz bootstrap-01c3f874e11ff561f2e2f8aabe408d3b9a44a52f.zip | |
Merge pull request #18888 from CrispyBacon12/nested-mixins-pass-breakpoints
Allow optional breakpoint arguments to be passed on to nested media query mixins
| -rw-r--r-- | scss/mixins/_grid-framework.scss | 2 | ||||
| -rw-r--r-- | scss/mixins/_grid.scss | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scss/mixins/_grid-framework.scss b/scss/mixins/_grid-framework.scss index bfe379ef8..16c970a81 100644 --- a/scss/mixins/_grid-framework.scss +++ b/scss/mixins/_grid-framework.scss @@ -21,7 +21,7 @@ @extend %grid-column; } } - @include media-breakpoint-up($breakpoint) { + @include media-breakpoint-up($breakpoint, $breakpoints) { // Work around cross-media @extend (https://github.com/sass/sass/issues/1050) %grid-column-float-#{$breakpoint} { float: left; diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss index 468bb39f2..230dacc54 100644 --- a/scss/mixins/_grid.scss +++ b/scss/mixins/_grid.scss @@ -14,9 +14,9 @@ // For each breakpoint, define the maximum width of the container in a media query -@mixin make-container-max-widths($max-widths: $container-max-widths) { +@mixin make-container-max-widths($max-widths: $container-max-widths, $breakpoints: $grid-breakpoints) { @each $breakpoint, $container-max-width in $max-widths { - @include media-breakpoint-up($breakpoint) { + @include media-breakpoint-up($breakpoint, $breakpoints) { max-width: $container-max-width; } } |