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.

Sign up for GitHub

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

Use traditional syntax for media queries #707

Merged
merged 2 commits into from
Nov 1, 2023
Merged

Use traditional syntax for media queries #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fef93ba
Use traditional syntax for media queries
VincentSmedinga Oct 31, 2023
6b6b9db
Merge branch 'main' into feature/DES-408-media-query-syntax
VincentSmedinga Nov 1, 2023
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
2 changes: 1 addition & 1 deletion packages/css/src/accordion/accordion.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
padding-inline: 1rem;
width: 100%;

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-accordion-button-wide-font-size);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/css/src/alert/alert.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
font-weight: var(--amsterdam-alert-title-font-weight);
line-height: var(--amsterdam-alert-title-line-height);

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-alert-title-wide-font-size);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/css/src/blockquote/blockquote.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
content: close-quote;
}

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-blockquote-wide-font-size);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/css/src/breadcrumb/breadcrumb.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
font-weight: var(--amsterdam-breadcrumb-font-weight);
line-height: var(--amsterdam-breadcrumb-line-height);

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-breadcrumb-wide-font-size);
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/css/src/button/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
.amsterdam-button {
font-size: var(--amsterdam-button-narrow-font-size);

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-button-wide-font-size);
}

Expand Down
4 changes: 2 additions & 2 deletions packages/css/src/checkbox/checkbox.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
width: 100%;
}

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
height: calc(var(--amsterdam-checkbox-checkmark-wide-size) * var(--amsterdam-checkbox-checkmark-multiplier));
}
}
Expand Down Expand Up @@ -65,7 +65,7 @@
}
}

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-checkbox-wide-font-size);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/css/src/form-label/form-label.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
font-weight: var(--amsterdam-form-label-font-weight);
line-height: var(--amsterdam-form-label-line-height);

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-form-label-wide-font-size);
}

Expand Down
8 changes: 4 additions & 4 deletions packages/css/src/heading/heading.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
font-size: var(--amsterdam-heading-1-narrow-font-size);
line-height: var(--amsterdam-heading-1-line-height);

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-heading-1-wide-font-size);
}
}
Expand All @@ -34,7 +34,7 @@
font-size: var(--amsterdam-heading-2-narrow-font-size);
line-height: var(--amsterdam-heading-2-line-height);

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-heading-2-wide-font-size);
}
}
Expand All @@ -43,7 +43,7 @@
font-size: var(--amsterdam-heading-3-narrow-font-size);
line-height: var(--amsterdam-heading-3-line-height);

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-heading-3-wide-font-size);
}
}
Expand All @@ -52,7 +52,7 @@
font-size: var(--amsterdam-heading-4-narrow-font-size);
line-height: var(--amsterdam-heading-4-line-height);

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-heading-4-wide-font-size);
}
}
Expand Down
20 changes: 10 additions & 10 deletions packages/css/src/icon/icon.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
.amsterdam-icon--size-3 {
height: calc(var(--amsterdam-icon-size-3-icon-size-narrow) * var(--amsterdam-icon-size-3-container-multiplier));

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
height: calc(var(--amsterdam-icon-size-3-icon-size-wide) * var(--amsterdam-icon-size-3-container-multiplier));
}
}
Expand All @@ -26,15 +26,15 @@
height: var(--amsterdam-icon-size-3-icon-size-narrow);
width: var(--amsterdam-icon-size-3-icon-size-narrow);

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
height: var(--amsterdam-icon-size-3-icon-size-wide);
width: var(--amsterdam-icon-size-3-icon-size-wide);
}
}
.amsterdam-icon--size-4 {
height: calc(var(--amsterdam-icon-size-4-icon-size-narrow) * var(--amsterdam-icon-size-4-container-multiplier));

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
height: calc(var(--amsterdam-icon-size-4-icon-size-wide) * var(--amsterdam-icon-size-4-container-multiplier));
}
}
Expand All @@ -43,7 +43,7 @@
height: var(--amsterdam-icon-size-4-icon-size-narrow);
width: var(--amsterdam-icon-size-4-icon-size-narrow);

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
height: var(--amsterdam-icon-size-4-icon-size-wide);
width: var(--amsterdam-icon-size-4-icon-size-wide);
}
Expand All @@ -52,7 +52,7 @@
.amsterdam-icon--size-5 {
height: calc(var(--amsterdam-icon-size-5-icon-size-narrow) * var(--amsterdam-icon-size-5-container-multiplier));

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
height: calc(var(--amsterdam-icon-size-5-icon-size-wide) * var(--amsterdam-icon-size-5-container-multiplier));
}
}
Expand All @@ -61,7 +61,7 @@
height: var(--amsterdam-icon-size-5-icon-size-narrow);
width: var(--amsterdam-icon-size-5-icon-size-narrow);

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
height: var(--amsterdam-icon-size-5-icon-size-wide);
width: var(--amsterdam-icon-size-5-icon-size-wide);
}
Expand All @@ -70,7 +70,7 @@
.amsterdam-icon--size-6 {
height: calc(var(--amsterdam-icon-size-6-icon-size-narrow) * var(--amsterdam-icon-size-6-container-multiplier));

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
height: calc(var(--amsterdam-icon-size-6-icon-size-wide) * var(--amsterdam-icon-size-6-container-multiplier));
}
}
Expand All @@ -79,7 +79,7 @@
height: var(--amsterdam-icon-size-6-icon-size-narrow);
width: var(--amsterdam-icon-size-6-icon-size-narrow);

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
height: var(--amsterdam-icon-size-6-icon-size-wide);
width: var(--amsterdam-icon-size-6-icon-size-wide);
}
Expand All @@ -88,7 +88,7 @@
.amsterdam-icon--size-7 {
height: calc(var(--amsterdam-icon-size-7-icon-size-narrow) * var(--amsterdam-icon-size-7-container-multiplier));

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
height: calc(var(--amsterdam-icon-size-7-icon-size-wide) * var(--amsterdam-icon-size-7-container-multiplier));
}
}
Expand All @@ -97,7 +97,7 @@
height: var(--amsterdam-icon-size-7-icon-size-narrow);
width: var(--amsterdam-icon-size-7-icon-size-narrow);

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
height: var(--amsterdam-icon-size-7-icon-size-wide);
width: var(--amsterdam-icon-size-7-icon-size-wide);
}
Expand Down
4 changes: 2 additions & 2 deletions packages/css/src/link/link.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
text-underline-offset: var(--amsterdam-link-standalone-hover-text-underline-offset);
}

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-link-standalone-wide-font-size);
}
}
Expand Down Expand Up @@ -70,7 +70,7 @@
text-underline-offset: var(--amsterdam-link-in-list-hover-text-underline-offset);
}

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-link-in-list-wide-font-size);
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/css/src/ordered-list/ordered-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
line-height: var(--amsterdam-ordered-list-line-height);
list-style-type: var(--amsterdam-ordered-list-list-style-type);

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-ordered-list-wide-font-size);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/css/src/page-heading/page-heading.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
font-weight: var(--amsterdam-page-heading-font-weight);
line-height: var(--amsterdam-page-heading-line-height);

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-page-heading-wide-font-size);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/css/src/page-menu/page-menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
text-decoration: var(--amsterdam-page-menu-item-text-decoration);
touch-action: manipulation;

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-page-menu-item-wide-font-size);
}
}
Expand Down
6 changes: 3 additions & 3 deletions packages/css/src/paragraph/paragraph.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
font-weight: var(--amsterdam-paragraph-font-weight);
line-height: var(--amsterdam-paragraph-line-height);

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-paragraph-wide-font-size);
}

Expand All @@ -29,7 +29,7 @@
font-size: var(--amsterdam-paragraph-small-narrow-font-size);
line-height: var(--amsterdam-paragraph-small-line-height);

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-paragraph-small-wide-font-size);
}
}
Expand All @@ -38,7 +38,7 @@
font-size: var(--amsterdam-paragraph-large-narrow-font-size);
line-height: var(--amsterdam-paragraph-large-line-height);

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-paragraph-large-wide-font-size);
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/css/src/top-task-link/top-task-link.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
font-weight: var(--amsterdam-top-task-link-label-font-weight);
line-height: var(--amsterdam-top-task-link-label-line-height);

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-top-task-link-label-wide-font-size);
}

Expand All @@ -47,7 +47,7 @@
font-weight: var(--amsterdam-top-task-link-description-font-weight);
line-height: var(--amsterdam-top-task-link-description-line-height);

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-top-task-link-description-wide-font-size);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/css/src/unordered-list/unordered-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
line-height: var(--amsterdam-unordered-list-line-height);
list-style-type: var(--amsterdam-unordered-list-list-style-type);

@media screen and (width > $amsterdam-breakpoint-typography) {
@media screen and (min-width: $amsterdam-breakpoint-typography) {
font-size: var(--amsterdam-unordered-list-wide-font-size);
}

Expand Down
2 changes: 1 addition & 1 deletion storybook/storybook-docs/src/breakpoint.stories.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Bijvoorbeeld:
.class {
/* Your narrow styling */

@media screen and (width > $amsterdam-breakpoint-wide) {
@media screen and (min-width: $amsterdam-breakpoint-wide) {
/* Your wide styling */
}
}
Expand Down
Loading