Skip to content

Css custom properties experiment #731

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

Draft
mgetzflex wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Css custom properties experiment #731

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
ffe4313
Test implementation of custom properties
mgetzflex May 15, 2026
773f19e
Reduce the number of places we were using tokens and define `--uswds`…
mgetzflex May 15, 2026
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
4 changes: 2 additions & 2 deletions sam-styles/packages/branding/elements/_borders.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

.border--hairline {
border: 0 !important;
box-shadow: 0 0 0 1px color("base-light");
box-shadow: 0 0 0 var(--sam-border-width-1px) color("base-light");
}

@media (min-resolution: 2dppx) {
Expand All @@ -48,4 +48,4 @@
border: 0 !important;
box-shadow: 0 0 0 0.25px;
}
}
}
16 changes: 8 additions & 8 deletions sam-styles/packages/branding/elements/_inputs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
@media (min-width: 30em) {
@include u-padding-x(4);
@include u-margin-y(3);
-moz-box-shadow: 2px 2px 10px 3px #c9c9c9;
-webkit-box-shadow: 2px 2px 10px 3px #c9c9c9;
box-shadow: 2px 2px 10px 3px #c9c9c9;
-moz-box-shadow: var(--sam-shadow-input-focus);
-webkit-box-shadow: var(--sam-shadow-input-focus);
box-shadow: var(--sam-shadow-input-focus);
}

.usa-legend {
Expand Down Expand Up @@ -142,7 +142,7 @@
.usa-checkbox__input[aria-checked="mixed"]+.usa-checkbox__label:before,
.usa-checkbox__input[aria-checked="mixed"]:disabled+.usa-checkbox__label:before {
@include u-bg("primary");
box-shadow: 0 0 0 2px #70e17b;
box-shadow: var(--sam-shadow-focus);
background-image: url("#{$sam-image-path}/minus-white.svg");
background-repeat: no-repeat;
background-position: center center;
Expand Down Expand Up @@ -202,7 +202,7 @@

.usa-checkbox,
.usa-radio {
background-color: transparent !important;
background-color: var(--sam-color-transparent) !important;

&__tooltip{
display: inline;
Expand All @@ -211,19 +211,19 @@
.usa-checkbox__input:checked+.usa-checkbox__label,
.usa-radio__input:checked+.usa-radio__label {
&::before {
background-color: #70e17b !important;
background-color: var(--sam-color-focus-green) !important;
}
}

.usa-checkbox__input:checked+.usa-checkbox__label {
&::before {
box-shadow: 0 0 0 2px #70e17b !important;
box-shadow: var(--sam-shadow-focus) !important;
}
}

.usa-radio__input:checked+.usa-radio__label {
&::before {
box-shadow: 0 0 0 2px #70e17b, inset 0 0 0 2px white !important;
box-shadow: 0 0 0 2px var(--sam-color-focus-green), inset 0 0 0 2px var(--sam-color-white) !important;
}
}
}
Expand Down
41 changes: 21 additions & 20 deletions sam-styles/packages/branding/elements/_tags.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
$info-light-alt: #9DDFEB;
$info-lighter-alt: #E7F6F8;
$info-dark-alt: #009EC1;
// Tag color variables using CSS custom properties
$info-light-alt: var(--sam-color-info-light);
$info-lighter-alt: var(--sam-color-info-lighter);
$info-dark-alt: var(--sam-color-info-dark);

$error-light-alt: #FDB8AE;
$error-lighter-alt: #FDB8AE;
$error-lightest-alt: #FDE0DB;
$error-dark-alt: #B50909;
$error-light-alt: var(--sam-color-error-light-alt);
$error-lighter-alt: var(--sam-color-error-light-alt);
$error-lightest-alt: var(--sam-color-error-lightest);
$error-dark-alt: var(--sam-color-error-dark-alt);

.usa-tag:last-of-type {
margin-right: units(0.5);
Expand All @@ -22,29 +23,29 @@ $error-dark-alt: #B50909;
}

.sds-tag--info-white {
background-color: white;
border: 1px solid #76766a;
font-weight: font-weight("semibold");
border-radius: 0;
background-color: var(--sam-color-white);
border: var(--sam-border-width-1px) solid var(--sam-color-border-olive);
font-weight: var(--sam-font-weight-semibold);
border-radius: var(--sam-border-radius-none);
@include u-text("base-darker");
}

// Chip tag

.sds-tag.sds-tag--chip {
background-color: color("primary-lighter");
border: 1px solid color("primary");
border: var(--sam-border-width-1px) solid color("primary");
@include u-font("sans", "3xs");
padding: 2px 5px;
padding: var(--sam-spacing-2px) var(--sam-spacing-6px);
@include u-display("inline-flex");
@include u-align-items("align-start");
@include u-margin-top("05");
}

.sds-tag.sds-tag--chip .sds-tag__close {
@include button-unstyled;
font-size: 12px;
margin-left: 5px;
font-size: var(--sam-font-size-12px);
margin-left: var(--sam-spacing-6px);
@include u-text("ink");
cursor: pointer;

Expand Down Expand Up @@ -232,11 +233,11 @@ $error-dark-alt: #B50909;
----------------------------------------
*/
.sds-type--label-title {
font-size: 14px;
font-size: var(--sam-font-size-14px);
font-style: italic;
font-weight: font-weight("thin");
font-weight: var(--sam-font-weight-thin);
margin: 0;
color: #5d5d52;
color: var(--sam-color-border-olive-dark);
}

.sds-tag--light {
Expand Down Expand Up @@ -456,10 +457,10 @@ $error-dark-alt: #B50909;
@include u-border("accent-cool");
}
&--locked {
background-color: #E5E5E5;
background-color: var(--sam-color-bg-silver);
@include u-border("base-light");
i {
margin-right: 8px;
margin-right: var(--sam-spacing-8px);
}
}
&--primary-lighter {
Expand Down
12 changes: 6 additions & 6 deletions sam-styles/packages/components/accordion/styles/accordion.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
&:disabled {
text-decoration: unset;
pointer-events: none;
background-color: transparent;
background-color: var(--sam-color-transparent);
color: color("base-light");
}

Expand All @@ -53,11 +53,11 @@
top: 0.8rem;
width: 25px;
height: 25px;
background: linear-gradient(#0a3466, #0a3466) #e2e2e2;
background: linear-gradient(var(--sam-color-brand-blue-dark), var(--sam-color-brand-blue-dark)) var(--sam-color-bg-light-gray);
background-position: center;
background-size: 54% 1px;
background-repeat: no-repeat;
border-radius: 50%;
border-radius: var(--sam-border-radius-circle);
}

&[aria-expanded="true"] {
Expand All @@ -78,12 +78,12 @@
top: 0.8rem;
width: 25px;
height: 25px;
background: linear-gradient(#0a3466, #0a3466);
background: linear-gradient(var(--sam-color-brand-blue-dark), var(--sam-color-brand-blue-dark));
background-position: center;
background-size: 1px 54%;
background-repeat: no-repeat;
border-radius: 50%;
z-index: 1;
border-radius: var(--sam-border-radius-circle);
z-index: var(--sam-z-index-base);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions sam-styles/packages/components/alerts/styles/alert.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,14 +196,14 @@
@include u-margin-y(1);
@include u-border(1px);
@include u-border('gray-10');
border-radius: 12px;
border-radius: var(--sam-border-radius-lg);

.sds-button--circle {
margin: auto;
}

&:hover {
box-shadow: 0 0 11px rgba(33, 33, 33, .2);
box-shadow: var(--sam-shadow-1);
}
}

Expand Down Expand Up @@ -254,7 +254,7 @@
@include u-margin-y(1);
@include u-border(1px);
@include u-border('gray-10');
border-radius: 12px;
border-radius: var(--sam-border-radius-lg);
flex-wrap: nowrap;
overflow-x: auto;

Expand Down
4 changes: 2 additions & 2 deletions sam-styles/packages/components/autocomplete/styles/autocomplete.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@
cursor: pointer;
&--highlighted,
&:hover {
background-color: #EFF6FB !important;
background-color: var(--sam-color-brand-blue-light) !important;
}
&--item {
font-weight: 600 !important;
font-weight: var(--sam-font-weight-semibold) !important;
@include u-display('inline');
}
&--secondary {
Expand Down
12 changes: 6 additions & 6 deletions sam-styles/packages/components/button-group/button-group.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@
}
.sds-button-group__item {
.mat-button-toggle-button{
padding: 8px;
padding: var(--sam-spacing-8px);
}
border-radius: 8px;
box-shadow: 1px 2px 4px 0px #00000080;
border-radius: var(--sam-border-radius-lg);
box-shadow: var(--sam-shadow-button-group);
@include u-bg('base-lightest');
@include u-border(2px, !important);
@include u-border('solid');
@include u-border('base-lightest', !important);

.mat-button-toggle-focus-overlay{
background-color: transparent;
background-color: var(--sam-color-transparent);
}

&:not(.mat-button-toggle-disabled):hover{
Expand All @@ -78,8 +78,8 @@
}
// Focus is placed on this class when tabbing
.mat-button-toggle-button:focus{
outline: solid 2px #2491FF;
outline-offset: 5px;
outline: solid var(--sam-border-width-2px) var(--sam-color-blue-focus);
outline-offset: var(--sam-spacing-6px);
}

}
Expand Down
Loading
Loading