Visitar URL original
USWDS - Utilities: Add theme setting for custom breakpoints by jamigibbs · Pull Request #5985 · uswds/uswds · GitHub
Skip to content

USWDS - Utilities: Add theme setting for custom breakpoints #5985

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

Closed
jamigibbs wants to merge 4 commits into from
Closed

USWDS - Utilities: Add theme setting for custom breakpoints #5985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b40b9ab
add $theme-utility-breakpoints-custom setting
jamigibbs Jul 19, 2024
e6c7682
run prettier
jamigibbs Jul 19, 2024
47a5d0a
Revert "run prettier"
jamigibbs Jul 19, 2024
5abc90c
run prettier again and fix mapping error
jamigibbs Jul 19, 2024
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
3 changes: 2 additions & 1 deletion packages/uswds-core/src/styles/_properties.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,8 @@ $system-properties: (
map-collect(
map.get($system-spacing, "large"),
map.get($system-spacing, "larger"),
map.get($system-spacing, "largest")
map.get($system-spacing, "largest"),
map.get($system-spacing, "custom")
),
extended: (),
),
Expand Down
6 changes: 5 additions & 1 deletion packages/uswds-core/src/styles/mixins/_utility-builder.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,11 @@ through all possible variants

$our-breakpoints: map-deep-get($system-properties, breakpoints, standard);
@each $media-key, $media-value in $our-breakpoints {
@if map.get($theme-utility-breakpoints-complete, $media-key) {
@if (map.get($theme-utility-breakpoints-complete, $media-key)) {
@include at-media($media-key) {
@include these-utilities($utilities, $media-key);
}
} @else if (map-has-key($theme-utility-breakpoints-custom, $media-key)) {
@include at-media($media-key) {
@include these-utilities($utilities, $media-key);
}
Expand Down
2 changes: 2 additions & 0 deletions packages/uswds-core/src/styles/settings/_settings-utilities.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ $theme-utility-breakpoints-complete: map.merge(
$theme-utility-breakpoints
) !default;

$theme-utility-breakpoints-custom: () !default;

/*
----------------------------------------
Global colors
Expand Down
2 changes: 2 additions & 0 deletions packages/uswds-core/src/styles/tokens/units/spacing.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@use "neg-prefix" as *;
@use "../../functions/units/spacing-multiple" as *;
@use "../../settings" as *;

$system-spacing: (
"smaller": (
Expand Down Expand Up @@ -98,6 +99,7 @@ $system-spacing: (
"widescreen": spacing-multiple(175),
// 1400px
),
"custom": $theme-utility-breakpoints-custom,
"special": (
0: spacing-multiple(0),
"auto": auto,
Expand Down