Skip to content

Replace hardcoded SCSS color values with CSS custom properties #14085

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

Open
abyrne-moz wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Replace hardcoded SCSS color values with CSS custom properties #14085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aaf66b6
Replace hardcoded SCSS color values with CSS custom properties
abyrne-moz Mar 20, 2026
cc53f21
Fix Prettier formatting in Select styles
abyrne-moz Mar 20, 2026
90a07ff
Convert remaining hardcoded SCSS colors to CSS custom properties
abyrne-moz Mar 20, 2026
caf6fd1
Fix undefined $yellow-40 variable in production build
abyrne-moz Mar 20, 2026
0c117a2
Convert border and outline colors to CSS custom properties
abyrne-moz Mar 20, 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 src/amo/components/AMInstallButton/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}

.AMInstallButton-loading-button {
background-color: $grey-20;
background-color: var(--amo-bg-neutral);
border-radius: 2px;
height: 32px;
}
Expand Down Expand Up @@ -103,7 +103,7 @@

.AMInstallButton-loader-ball {
animation: squash $speed ease-in-out infinite alternate;
background: $blue-60;
background: var(--amo-accent-color);
border-radius: 50%;
height: $height;
width: $width;
Expand Down
2 changes: 1 addition & 1 deletion src/amo/components/AddonFeedbackForm/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ $icon-size: 32px;
}

.AddonFeedbackForm-header-metadata {
color: $grey-50;
color: var(--amo-text-muted);
grid-column: 2 / span 2;
grid-row: 2;

Expand Down
4 changes: 2 additions & 2 deletions src/amo/components/AddonRecommendations/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
padding: 12px 24px;

&:hover {
background-color: $grey-10;
background-color: var(--amo-hover-bg);
border-radius: $border-radius-default;
cursor: pointer;

.SearchResult-name {
color: $link-color;
color: var(--amo-link-color);
}

.SearchResult-users {
Expand Down
8 changes: 4 additions & 4 deletions src/amo/components/AddonReviewCard/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
&:visited,
&:hover,
&:active {
color: $blue-50;
color: var(--amo-link-color);
Copy link
Member

@diox diox Mar 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: here and in other places where $blue-50 is replaced by var(--amo-link-color), this is a slight departure from the previous style, since --amo-link-color is $link-color, which is $blue-60.

It's not necessarily a bad thing (fewer colors to worry about is probably a good thing), but worth double-checking in case that has undesirable effects with regards to contrast etc.

font-weight: normal;
text-decoration: underline;
}
Expand All @@ -56,7 +56,7 @@
.AddonReviewCard-delete {
background: none;
border: 0;
color: $blue-50;
color: var(--amo-link-color);
font-size: $font-size-s;
height: auto;
line-height: $line-height-body;
Expand All @@ -71,11 +71,11 @@
}

.AddonReviewCard-ratingOnly.AddonReviewCard-slim & {
color: $text-color-default;
color: var(--amo-text-heading);

&:active,
&:hover {
color: $blue-50;
color: var(--amo-link-color);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/amo/components/AddonReviewManager/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
&,
&:link,
&:visited {
color: $black;
color: var(--amo-input-text);
Copy link
Member

@diox diox Mar 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not the right choice - It's not a text input/form widget

}

&:active,
&:hover {
color: $link-color;
color: var(--amo-link-color);
}
}
}
Expand All @@ -38,7 +38,7 @@
.AddonReviewManager-savedRating {
@include margin-start(6px);

color: $grey-50;
color: var(--amo-text-muted);
flex-grow: 1;
opacity: 1;
text-align: right;
Expand Down
6 changes: 3 additions & 3 deletions src/amo/components/AddonSuggestions/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import '~amo/css/styles';

.AddonSuggestions {
background: $white;
background: var(--amo-bg-content);
border-bottom-left-radius: $border-radius-default;
border-bottom-right-radius: $border-radius-default;
margin-top: 0;
Expand Down Expand Up @@ -31,12 +31,12 @@
padding: 12px 24px;

&:hover {
background-color: $grey-10;
background-color: var(--amo-hover-bg);
border-radius: $border-radius-default;
cursor: pointer;

.SearchResult-name {
color: $link-color;
color: var(--amo-link-color);
}

.SearchResult-users {
Expand Down
6 changes: 3 additions & 3 deletions src/amo/components/AddonSummaryCard/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

a,
a:link {
color: $link-color;
color: var(--amo-link-color);
text-decoration: none;
}

Expand All @@ -62,7 +62,7 @@

a,
a:link {
color: $black;
color: var(--amo-input-text);
Copy link
Member

@diox diox Mar 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not the right choice - It's not a text input/form widget

font-size: $font-size-l;
text-decoration: underline;
}
Expand All @@ -76,7 +76,7 @@
}

.AddonSummaryCard-addonAverage {
color: $grey-50;
color: var(--amo-text-muted);
margin-top: 6px;
text-align: center;
}
2 changes: 1 addition & 1 deletion src/amo/components/AddonTitle/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.AddonTitle {
@include font-regular;

color: $black;
color: var(--amo-text-primary);
font-size: $font-size-heading-s;
grid-column: 1 / span 2;
margin: 0;
Expand Down
6 changes: 3 additions & 3 deletions src/amo/components/AddonVersionCard/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@
.AddonVersionCard-version {
@include font-medium;

color: $link-color;
color: var(--amo-link-color);
}

.AddonVersionCard-fileInfo,
.AddonVersionCard-compatibility {
color: $grey-50;
color: var(--amo-text-muted);
}

.AddonVersionCard-releaseNotes {
Expand All @@ -64,5 +64,5 @@
}

.AddonVersionCard-license {
color: $grey-50;
color: var(--amo-text-muted);
}
2 changes: 1 addition & 1 deletion src/amo/components/AddonsByAuthorsCard/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

@include respond-to(large) {
.Card-contents .AddonsCard-list {
background-color: $white;
background-color: var(--amo-bg-content);
display: grid;
grid-auto-flow: initial;
grid-gap: 6px;
Expand Down
4 changes: 2 additions & 2 deletions src/amo/components/AddonsCard/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
position: relative;

.Card-contents {
background: $white;
background: var(--amo-bg-content);
border-bottom-left-radius: $border-radius-default;
border-bottom-right-radius: $border-radius-default;
padding: 12px 6px;
Expand Down Expand Up @@ -99,7 +99,7 @@

.SearchResult-wrapper:focus,
.SearchResult-wrapper:hover {
background-color: $grey-10;
background-color: var(--amo-hover-bg);
border-radius: $border-radius-default;

// stylelint-disable max-nesting-depth
Expand Down
18 changes: 9 additions & 9 deletions src/amo/components/App/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

html,
body {
background: $header-base-color;
background: var(--amo-bg-body);
height: 100%;
}

Expand All @@ -17,11 +17,11 @@ textarea {
// Fix search input and possibly other inputs.
// See https://github.com/mozilla/addons-frontend/issues/3640

background: $white;
border: 1px solid $grey-50;
background: var(--amo-bg-input);
border: 1px solid var(--amo-border-color);
Copy link
Member

@diox diox Mar 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Subtle change

border-radius: $border-radius-xs;
box-shadow: none;
color: $black;
color: var(--amo-input-text);
font-size: $font-size-default;
padding: 4px;
}
Expand All @@ -42,7 +42,7 @@ textarea {
body {
@include font-regular;

color: $body-font-color;
color: var(--amo-text-body);
font-size: $font-size-default;
line-height: $line-height-body;
}
Expand All @@ -55,7 +55,7 @@ h1,
h2 {
@include font-bold;

color: $primary-font-color;
color: var(--amo-text-primary);
font-weight: 600;
line-height: $line-height-compressed;
}
Expand All @@ -78,7 +78,7 @@ h3 {
a:link {
@include font-medium;

color: $link-color;
color: var(--amo-link-color);
}

em {
Expand All @@ -90,12 +90,12 @@ strong {
}

.caption {
color: $primary-font-color;
color: var(--amo-text-primary);
font-size: $font-size-xs;
}

.date-time {
color: #b1b1b1;
color: var(--amo-text-date);
Copy link
Member

@diox diox Mar 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it's worth having its own variable. Let's use --amo-text-muted-light instead, which is incredibly close.

font-size: $font-size-default;
}

Expand Down
16 changes: 8 additions & 8 deletions src/amo/components/AutoSearchInput/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@
@include padding-start(28px);

// This prevents a flicker of black when focusing on mobile.
background-color: $white;
border: 1px solid $white;
background-color: var(--amo-bg-input);
border: 1px solid var(--amo-border-color);
Comment on lines +12 to +13
Copy link
Member

@diox diox Mar 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Significant changes, need a more careful look to see if that impacts anything (see existing comment in the CSS a couple lines above)

border-radius: $border-radius-s;
color: $black;
color: var(--amo-input-text);
height: 27px;
outline: 0;
text-overflow: ellipsis;
white-space: nowrap;
width: 100%;

&:hover {
border-color: $teal-50;
border-color: var(--amo-focus-border);
}

&:focus {
@include focus;

border-color: $teal-50;
border-color: var(--amo-focus-border);
}

@include respond-to(medium) {
Expand All @@ -42,11 +42,11 @@
.AutoSearchInput-suggestions-list {
@include end(0);

background-color: $white;
background-color: var(--amo-bg-content);
border-bottom-left-radius: $border-radius-s;
border-bottom-right-radius: $border-radius-s;
box-shadow: 1px 4px 3px transparentize($black, 0.5);
color: $black;
color: var(--amo-input-text);
margin: 0;
padding: 0;
position: absolute;
Expand All @@ -66,7 +66,7 @@
.AutoSearchInput-suggestions-item:active,
.AutoSearchInput-suggestions-item:focus,
.AutoSearchInput-suggestions-item--highlighted {
color: $link-color;
color: var(--amo-link-color);
white-space: normal;

.SearchSuggestion-icon-arrow {
Expand Down
8 changes: 4 additions & 4 deletions src/amo/components/Badge/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ $badge-size-small: 12px;
.Badge {
align-items: center;
border-radius: 22px;
border: 1px solid $color-light-gray-40;
border: 1px solid var(--amo-border-color);
box-sizing: border-box;
color: $grey-90;
color: var(--amo-text-dark);
display: inline-flex;
font-size: $font-size-default;
gap: 6px;
Expand All @@ -20,13 +20,13 @@ $badge-size-small: 12px;
&:hover,
&:active,
&:focus {
border-color: $color-light-gray-90;
border-color: var(--amo-border-color);
}
}

.Badge-link {
align-items: center;
color: $color-dark-gray-05;
color: var(--amo-text-dark);
Copy link
Member

@diox diox Mar 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Significant change here and above, but I think for the better.

display: flex;
flex-grow: 0;
flex-shrink: 0;
Expand Down
5 changes: 3 additions & 2 deletions src/amo/components/Card/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ $footer-padding: 10px;

border-top-left-radius: $border-radius-default;
border-top-right-radius: $border-radius-default;
color: var(--amo-text-primary);
font-size: $font-size-default;
margin-bottom: 1px;
margin-top: 0;
Expand Down Expand Up @@ -70,15 +71,15 @@ $footer-padding: 10px;
a:hover,
a:link,
a:visited {
color: $link-color;
color: var(--amo-link-color);
display: block;
font-weight: normal;
padding: $footer-padding;
text-decoration: none;
}

a:focus {
outline: 1px dotted $link-color;
outline: 1px dotted var(--amo-link-color);
outline: auto 5px -webkit-focus-ring-color;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/amo/components/CardList/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
padding: 0;

> li {
background: $white;
background: var(--amo-bg-content);
margin-bottom: 1px;
padding: $padding-page;

Expand Down
2 changes: 1 addition & 1 deletion src/amo/components/CollectionAddAddon/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
}

.AutoSearchInput-query {
border: 1px solid $grey-50;
border: 1px solid var(--amo-border-color);
border-radius: $border-radius-xs;
}

Expand Down
Loading