From: Chris Purssell <chris.purssell@revelian.com>
Date: Thu, 14 Jan 2016 06:33:04 +0000 (+1000)
Subject: Allow custom breakpoint config to be passed on by mixins which nest media query mixins.
X-Git-Tag: v4.0.0-alpha.3~370^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0762a1978c27a849f7bc68a8d6262017ab2bde98;p=thirdparty%2Fbootstrap.git

Allow custom breakpoint config to be passed on by mixins which nest media query mixins.
---

diff --git a/scss/mixins/_grid-framework.scss b/scss/mixins/_grid-framework.scss
index bfe379ef82..16c970a81c 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 468bb39f28..230dacc547 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;
     }
   }