From: JasonMiller Date: Sat, 16 Jun 2018 07:49:42 +0000 (+0200) Subject: Use pull request #10978 from JasonMiller/breakpoint-mixin-max-width-values for v6.5.0 X-Git-Tag: v6.5.0-rc.1^2~74 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4e05a50f0d914f9c5d7f0ada1f39b33dedcc9c5;p=thirdparty%2Ffoundation%2Ffoundation-sites.git Use pull request #10978 from JasonMiller/breakpoint-mixin-max-width-values for v6.5.0 b50a45aa0 decrement bp-max by 0.0001 rather than 1/16 283483aca update max-widths values 74254be7c remove leading zero from bp-max decrement fc749cd71 fix: use 6-decimal precision between breakpoint cc9279493 fix: revert to Sass default 5-digit precision for breakpoint gutters Co-Authored-By: Nicolas Coden Signed-off-by: Nicolas Coden --- diff --git a/scss/components/_visibility.scss b/scss/components/_visibility.scss index 8906f5977..75472918a 100644 --- a/scss/components/_visibility.scss +++ b/scss/components/_visibility.scss @@ -6,7 +6,7 @@ /// @param {Keyword} $size - Breakpoint to use. **Must be a breakpoint defined in `$breakpoints`.** @mixin show-for($size) { $size: map-get($breakpoints, $size); - $size: -zf-bp-to-em($size) - (1 / 16); + $size: -zf-bp-to-em($size) - .00001; @include breakpoint($size down) { display: none !important; @@ -20,7 +20,7 @@ $upper-bound-size: -zf-map-next($breakpoints, $size); // more often than not this will be correct, just one time round the loop it won't so set in scope here - $lower-bound: -zf-bp-to-em($lower-bound-size) - (1 / 16); + $lower-bound: -zf-bp-to-em($lower-bound-size) - .00001; // test actual lower-bound-size, if 0 set it to 0em @if strip-unit($lower-bound-size) == 0 { $lower-bound: -zf-bp-to-em($lower-bound-size); diff --git a/scss/util/_breakpoint.scss b/scss/util/_breakpoint.scss index 23bc7770e..39f6fc8b0 100644 --- a/scss/util/_breakpoint.scss +++ b/scss/util/_breakpoint.scss @@ -77,7 +77,7 @@ $breakpoint-classes: (small medium large) !default; // Convert any pixel, rem, or unitless value to em $bp: -zf-bp-to-em($bp); @if $bp-max { - $bp-max: -zf-bp-to-em($bp-max) - (1/16); + $bp-max: -zf-bp-to-em($bp-max) - .00001; } // Conditions to skip media query creation diff --git a/test/sass/_breakpoint.scss b/test/sass/_breakpoint.scss index d013ac47d..1ea9badf9 100755 --- a/test/sass/_breakpoint.scss +++ b/test/sass/_breakpoint.scss @@ -24,10 +24,10 @@ @include test('Breakpoint (Only Range) [function]') { $test: breakpoint(medium only); - $expect: '(min-width: 40em) and (max-width: 63.9375em)'; + $expect: '(min-width: 40em) and (max-width: 63.99999em)'; $test-lowest: breakpoint(small only); - $expect-lowest: '(max-width: 39.9375em)'; + $expect-lowest: '(max-width: 39.99999em)'; $test-highest: breakpoint(xxlarge only); $expect-highest: '(min-width: 90em)'; @@ -44,13 +44,13 @@ @include test('Breakpoint (Named Down Range) [function]') { $test: breakpoint(medium down); - $expect: '(max-width: 63.9375em)'; + $expect: '(max-width: 63.99999em)'; @include assert-equal($test, $expect, 'Creates a down range out of a medium breakpoint'); $test-lowest: breakpoint(small down); - $expect-lowest: '(max-width: 39.9375em)'; + $expect-lowest: '(max-width: 39.99999em)'; @include assert-equal($test-lowest, $expect-lowest, 'Creates a down range out of a small breakpoint'); @@ -156,5 +156,4 @@ @include assert-equal(-zf-get-bp-val($config, xlarge), 1, 'Given a nearby breakpoint, returns the next lowest value'); } - }