Skip to content

Commit

Permalink
Change breakpoint-max implementation
Browse files Browse the repository at this point in the history
- The `media-breakpoint-down()` uses the breakpoint itself instead of the next breakpoint. Use `media-breakpoint-down(lg)` instead of `media-breakpoint-down(md)` to target viewports smaller than the `lg` breakpoint.
- The `media-breakpoint-between()` mixin's second parameter also uses the breakpoint itself instead of the next breakpoint. Use `media-between(sm, lg)` instead of `media-breakpoint-between(sm, md)` to target viewports between the `sm` and `lg` breakpoints.
  • Loading branch information
MartijnCuppens authored and XhmikosR committed May 15, 2020
1 parent 01d1d6b commit c0352f8
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 21 deletions.
4 changes: 2 additions & 2 deletions scss/_modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@
}

@each $breakpoint in map-keys($grid-breakpoints) {
$next-breakpoint: breakpoint-next($breakpoint);
$postfix: if(breakpoint-max($breakpoint, $grid-breakpoints) == null, "", "-#{$next-breakpoint}-down");
$infix: breakpoint-infix($breakpoint, $grid-breakpoints);
$postfix: if($infix != "", $infix + "-down", "");

@include media-breakpoint-down($breakpoint) {
.modal-fullscreen#{$postfix} {
Expand Down
3 changes: 1 addition & 2 deletions scss/_tables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,7 @@
// size of where your table will overflow.

@each $breakpoint in map-keys($grid-breakpoints) {
$next: breakpoint-next($breakpoint, $grid-breakpoints);
$infix: breakpoint-infix($next, $grid-breakpoints);
$infix: breakpoint-infix($breakpoint, $grid-breakpoints);

@include media-breakpoint-down($breakpoint) {
.table-responsive#{$infix} {
Expand Down
14 changes: 7 additions & 7 deletions scss/mixins/_breakpoints.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@
@return if($min != 0, $min, null);
}

// Maximum breakpoint width. Null for the largest (last) breakpoint.
// The maximum value is calculated as the minimum of the next one less 0.02px
// to work around the limitations of `min-` and `max-` prefixes and viewports with fractional widths.
// Maximum breakpoint width.
// The maximum value is reduced by 0.02px to work around the limitations of
// `min-` and `max-` prefixes and viewports with fractional widths.
// See https://www.w3.org/TR/mediaqueries-4/#mq-min-max
// Uses 0.02px rather than 0.01px to work around a current rounding bug in Safari.
// See https://bugs.webkit.org/show_bug.cgi?id=178261
//
// >> breakpoint-max(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))
// >> breakpoint-max(md, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))
// 767.98px
@function breakpoint-max($name, $breakpoints: $grid-breakpoints) {
$next: breakpoint-next($name, $breakpoints);
@return if($next, breakpoint-min($next, $breakpoints) - .02, null);
$max: map-get($breakpoints, $name);
@return if($max and $max > 0, $max - .02, null);
}

// Returns a blank string if smallest breakpoint, otherwise returns the name with a dash in front.
Expand Down Expand Up @@ -108,7 +108,7 @@
// Makes the @content apply only to the given breakpoint, not viewports any wider or narrower.
@mixin media-breakpoint-only($name, $breakpoints: $grid-breakpoints) {
$min: breakpoint-min($name, $breakpoints);
$max: breakpoint-max($name, $breakpoints);
$max: breakpoint-max(breakpoint-next($name, $breakpoints));

@if $min != null and $max != null {
@media (min-width: $min) and (max-width: $max) {
Expand Down
2 changes: 1 addition & 1 deletion site/assets/scss/_content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
margin-bottom: 1.5rem;
@include font-size(.875rem);

@include media-breakpoint-down(md) {
@include media-breakpoint-down(lg) {
display: block;
overflow-x: auto;

Expand Down
2 changes: 1 addition & 1 deletion site/assets/scss/_navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
padding: .625rem 0;
background-color: $bd-purple-bright;

@include media-breakpoint-down(md) {
@include media-breakpoint-down(lg) {
.navbar-nav-scroll {
width: 100%;
margin-top: .25rem;
Expand Down
2 changes: 1 addition & 1 deletion site/assets/scss/_subnav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
.bd-search {
position: relative; // To contain the Algolia search

@include media-breakpoint-down(sm) {
@include media-breakpoint-down(md) {
width: 100%;
}

Expand Down
21 changes: 14 additions & 7 deletions site/content/docs/5.0/layout/breakpoints.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,12 @@ These Sass mixins translate in our compiled CSS using the values declared in our
We occasionally use media queries that go in the other direction (the given screen size *or smaller*):

{{< highlight scss >}}
@include media-breakpoint-down(xs) { ... }
// No media query necessary for xs breakpoint as it's effectively `@media (max-width: 0) { ... }`
@include media-breakpoint-down(sm) { ... }
@include media-breakpoint-down(md) { ... }
@include media-breakpoint-down(lg) { ... }
@include media-breakpoint-down(xl) { ... }
// No media query necessary for xxl breakpoint as it has no upper bound on its width
@include media-breakpoint-down(xxl) { ... }

// Example: Style from medium breakpoint and down
@include media-breakpoint-down(md) {
Expand Down Expand Up @@ -181,18 +181,25 @@ There are also media queries and mixins for targeting a single segment of screen
@include media-breakpoint-only(xxl) { ... }
{{< /highlight >}}

Similarly, media queries may span multiple breakpoint widths:
For example the `@include media-breakpoint-only(md) { ... }` will result in :

{{< highlight scss >}}
// Example
// Apply styles starting from medium devices and up to extra large devices
@media (min-width: 768px) and (max-width: 1199.98px) { ... }
@media (min-width: 768px) and (max-width: 991.98px) { ... }
{{< /highlight >}}

### Between breakpoints

The Sass mixin for targeting the same screen size range would be:
Similarly, media queries may span multiple breakpoint widths:

{{< highlight scss >}}
@include media-breakpoint-between(md, xl) { ... }
{{< /highlight >}}

Which results in:

{{< highlight scss >}}
// Example
// Apply styles starting from medium devices and up to extra large devices
@media (min-width: 768px) and (max-width: 1199.98px) { ... }
{{< /highlight >}}

2 changes: 2 additions & 0 deletions site/content/docs/5.0/migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ Changes to our source Sass files and compiled CSS.
- `$yiq-text-dark` and `$yiq-text-light` are respectively renamed to `$color-contrast-dark` and `$color-contrast-light`.
- Linear gradients are simplified when gradients are enabled and therefore, `gradient-bg()` now only accepts an optional `$color` parameter.
- The `bg-gradient-variant()` mixin is removed since the `.bg-gradient` class can now be used to add gradients to elements instead of the `.bg-gradient-*` classes.
- The `media-breakpoint-down()` uses the breakpoint itself instead of the next breakpoint. Use `media-breakpoint-down(lg)` instead of `media-breakpoint-down(md)` to target viewports smaller than the `lg` breakpoint.
- The `media-breakpoint-between()` mixin's second parameter also uses the breakpoint itself instead of the next breakpoint. Use `media-between(sm, lg)` instead of `media-breakpoint-between(sm, md)` to target viewports between the `sm` and `lg` breakpoints.

## JavaScript

Expand Down

0 comments on commit c0352f8

Please sign in to comment.