mirror of
https://github.com/twbs/bootstrap.git
synced 2025-04-06 23:57:36 +02:00
Fix breakpoint mixins for custom breakpoint maps (#25264)
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:
parent
f4bf0542d7
commit
216c7ea20f
@ -90,11 +90,11 @@
|
|||||||
@content;
|
@content;
|
||||||
}
|
}
|
||||||
} @else if $max == null {
|
} @else if $max == null {
|
||||||
@include media-breakpoint-up($lower) {
|
@include media-breakpoint-up($lower, $breakpoints) {
|
||||||
@content;
|
@content;
|
||||||
}
|
}
|
||||||
} @else if $min == null {
|
} @else if $min == null {
|
||||||
@include media-breakpoint-down($upper) {
|
@include media-breakpoint-down($upper, $breakpoints) {
|
||||||
@content;
|
@content;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -112,11 +112,11 @@
|
|||||||
@content;
|
@content;
|
||||||
}
|
}
|
||||||
} @else if $max == null {
|
} @else if $max == null {
|
||||||
@include media-breakpoint-up($name) {
|
@include media-breakpoint-up($name, $breakpoints) {
|
||||||
@content;
|
@content;
|
||||||
}
|
}
|
||||||
} @else if $min == null {
|
} @else if $min == null {
|
||||||
@include media-breakpoint-down($name) {
|
@include media-breakpoint-down($name, $breakpoints) {
|
||||||
@content;
|
@content;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user