Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(core): set fractional breakpoints to .98 instead of .9 #1308

Merged
merged 1 commit into from
Nov 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/lib/core/breakpoints/data/break-points.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,52 +13,52 @@ import {BreakPoint} from '../break-point';
export const DEFAULT_BREAKPOINTS: BreakPoint[] = [
{
alias: 'xs',
mediaQuery: 'screen and (min-width: 0px) and (max-width: 599.9px)',
mediaQuery: 'screen and (min-width: 0px) and (max-width: 599.98px)',
priority: 1000,
},
{
alias: 'sm',
mediaQuery: 'screen and (min-width: 600px) and (max-width: 959.9px)',
mediaQuery: 'screen and (min-width: 600px) and (max-width: 959.98px)',
priority: 900,
},
{
alias: 'md',
mediaQuery: 'screen and (min-width: 960px) and (max-width: 1279.9px)',
mediaQuery: 'screen and (min-width: 960px) and (max-width: 1279.98px)',
priority: 800,
},
{
alias: 'lg',
mediaQuery: 'screen and (min-width: 1280px) and (max-width: 1919.9px)',
mediaQuery: 'screen and (min-width: 1280px) and (max-width: 1919.98px)',
priority: 700,
},
{
alias: 'xl',
mediaQuery: 'screen and (min-width: 1920px) and (max-width: 4999.9px)',
mediaQuery: 'screen and (min-width: 1920px) and (max-width: 4999.98px)',
priority: 600,
},
{
alias: 'lt-sm',
overlapping: true,
mediaQuery: 'screen and (max-width: 599.9px)',
mediaQuery: 'screen and (max-width: 599.98px)',
priority: 950,
},
{
alias: 'lt-md',
overlapping: true,
mediaQuery: 'screen and (max-width: 959.9px)',
mediaQuery: 'screen and (max-width: 959.98px)',
priority: 850,
},
{
alias: 'lt-lg',
overlapping: true,
mediaQuery: 'screen and (max-width: 1279.9px)',
mediaQuery: 'screen and (max-width: 1279.98px)',
priority: 750,
},
{
alias: 'lt-xl',
overlapping: true,
priority: 650,
mediaQuery: 'screen and (max-width: 1919.9px)',
mediaQuery: 'screen and (max-width: 1919.98px)',
},
{
alias: 'gt-xs',
Expand Down
8 changes: 4 additions & 4 deletions src/lib/core/breakpoints/data/orientation-break-points.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
import {BreakPoint} from '../break-point';

/* tslint:disable */
const HANDSET_PORTRAIT = '(orientation: portrait) and (max-width: 599.9px)';
const HANDSET_LANDSCAPE = '(orientation: landscape) and (max-width: 959.9px)';
const HANDSET_PORTRAIT = '(orientation: portrait) and (max-width: 599.98px)';
const HANDSET_LANDSCAPE = '(orientation: landscape) and (max-width: 959.98px)';

const TABLET_PORTRAIT = '(orientation: portrait) and (min-width: 600px) and (max-width: 839.9px)';
const TABLET_LANDSCAPE = '(orientation: landscape) and (min-width: 960px) and (max-width: 1279.9px)';
const TABLET_PORTRAIT = '(orientation: portrait) and (min-width: 600px) and (max-width: 839.98px)';
const TABLET_LANDSCAPE = '(orientation: landscape) and (min-width: 960px) and (max-width: 1279.98px)';

const WEB_PORTRAIT = '(orientation: portrait) and (min-width: 840px)';
const WEB_LANDSCAPE = '(orientation: landscape) and (min-width: 1280px)';
Expand Down
6 changes: 3 additions & 3 deletions src/lib/core/match-media/mock/mock-match-media.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -259,13 +259,13 @@ describe('mock-match-media', () => {
it('activates overlapping breakpoints correct', () => {
mediaController.activate('xs', true);
expect(mediaController
.isActive('screen and (min-width: 0px) and (max-width: 599.9px)'))
.isActive('screen and (min-width: 0px) and (max-width: 599.98px)'))
.toBe(true);
expect(mediaController
.isActive('screen and (min-width: 600px) and (max-width: 959.9px)'))
.isActive('screen and (min-width: 600px) and (max-width: 959.98px)'))
.toBe(false);
expect(mediaController
.isActive('screen and (max-width: 599.9px)'))
.isActive('screen and (max-width: 599.98px)'))
.toBe(true);
});
});
6 changes: 3 additions & 3 deletions src/lib/core/media-observer/media-observer.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ describe('media-observer', () => {
describe('with custom BreakPoints', () => {
const gtXsMediaQuery = 'screen and (min-width:120px) and (orientation:landscape)';
const superXLQuery = 'screen and (min-width:10000px)';
const smMediaQuery = 'screen and (min-width: 600px) and (max-width: 959.9px)';
const smMediaQuery = 'screen and (min-width: 600px) and (max-width: 959.98px)';

const CUSTOM_BREAKPOINTS = [
{alias: 'slate.xl', priority: 11000, mediaQuery: superXLQuery},
Expand Down Expand Up @@ -233,7 +233,7 @@ describe('media-observer', () => {
});

describe('with layout "print" configured', () => {
const mdMediaQuery = 'screen and (min-width: 960px) and (max-width: 1279.9px)';
const mdMediaQuery = 'screen and (min-width: 960px) and (max-width: 1279.98px)';

beforeEach(() => {
// Configure testbed to prepare services
Expand Down Expand Up @@ -285,7 +285,7 @@ describe('media-observer', () => {
});

describe('with layout print NOT configured', () => {
const smMediaQuery = 'screen and (min-width: 600px) and (max-width: 959.9px)';
const smMediaQuery = 'screen and (min-width: 600px) and (max-width: 959.98px)';

beforeEach(() => {
// Configure testbed to prepare services
Expand Down