rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

Fix breakpoint mixins for custom breakpoint maps (#25264)

Browse Source 
When using the `media-breakpoint-between` or `media-breakpoint-only`
mixins with a custom breakpoint map – not defined as `$grid-breakpoints`
– the mixin incorrectly defaults back to the global `$grid-breakpoints`
map in certain situations. This commit correctly passes on the
`$breakpoints` argument to the other mixins called within the block.
This commit is contained in:
Sander Melnikov 2018-01-13 10:45:21 +03:00 committed by XhmikosR
parent f4bf0542d7
commit 216c7ea20f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scss/mixins/_breakpoints.scss
View File

@ -90,11 +90,11 @@
@content;
}
} @else if $max == null {
@include media-breakpoint-up($lower) {
@include media-breakpoint-up($lower, $breakpoints) {
@content;
}
} @else if $min == null {
@include media-breakpoint-down($upper) {
@include media-breakpoint-down($upper, $breakpoints) {
@content;
}
}
@ -112,11 +112,11 @@
@content;
}
} @else if $max == null {
@include media-breakpoint-up($name) {
@include media-breakpoint-up($name, $breakpoints) {
@content;
}
} @else if $min == null {
@include media-breakpoint-down($name) {
@include media-breakpoint-down($name, $breakpoints) {
@content;
}
}