mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00
Code Activity

Merge pull request #18888 from CrispyBacon12/nested-mixins-pass-breakpoints

Browse Source 
Allow optional breakpoint arguments to be passed on to nested media query mixins
This commit is contained in:
Chris Rebert
2016-01-13 23:47:32 -08:00
parent 6ff249791e 0762a1978c
commit 01c3f874e1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scss/mixins/_grid-framework.scss
+1 -1
View File
@@ -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;
scss/mixins/_grid.scss
+2 -2
View File
@@ -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;
}
}