Skip to content

refactor: use system background #31226

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
wants to merge 1 commit into from
Closed

refactor: use system background #31226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/material/badge/_m2-badge.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ $_large-size: $_default-size + 6px;
// Tokens that can be configured through Angular Material's color theming API.
@function get-color-tokens($theme) {
$primary-color-tokens: private-get-color-palette-color-tokens($theme, primary);
$app-background: inspection.get-theme-color($theme, background, background);
$app-background: inspection.get-theme-color($theme, system, background);
$disabled-background: inspection.get-theme-color($theme, foreground, disabled-button);

// The disabled color usually has some kind of opacity, but because the badge is overlayed
Expand Down
2 changes: 1 addition & 1 deletion src/material/core/_m2-app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// Tokens that can be configured through Angular Material's color theming API.
@function get-color-tokens($theme) {
$tokens: (
app-background-color: inspection.get-theme-color($theme, background, background),
app-background-color: inspection.get-theme-color($theme, system, background),
app-text-color: inspection.get-theme-color($theme, system, on-surface),
);

Expand Down
2 changes: 2 additions & 0 deletions src/material/core/m2/_theming.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
surface: white,
on-surface: rgba(black, 0.87),
outline: rgba(black, 0.12),
background: map.get(palette.$grey-palette, 50),
hover-state-layer-opacity: 0.04,
focus-state-layer-opacity: 0.12,
pressed-state-layer-opacity: 0.12,
Expand All @@ -147,6 +148,7 @@
system: (
surface: map.get(palette.$grey-palette, 800),
on-surface: white,
background: #303030,
outline: rgba(white, 0.12),
hover-state-layer-opacity: 0.04,
focus-state-layer-opacity: 0.12,
Expand Down
2 changes: 1 addition & 1 deletion src/material/core/selection/pseudo-checkbox/_m2-pseudo-checkbox.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
@function get-color-tokens($theme, $palette-name: accent) {
$is-dark: inspection.get-theme-type($theme) == dark;
$disabled-color: if($is-dark, #686868, #b0b0b0);
$checkmark-color: inspection.get-theme-color($theme, background, background);
$checkmark-color: inspection.get-theme-color($theme, system, background);

@return (
pseudo-checkbox-full-selected-icon-color: inspection.get-theme-color($theme, $palette-name),
Expand Down
2 changes: 1 addition & 1 deletion src/material/sidenav/_m2-sidenav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
sidenav-container-divider-color: inspection.get-theme-color($theme, system, outline),
sidenav-container-background-color: inspection.get-theme-color($theme, system, surface),
sidenav-container-text-color: inspection.get-theme-color($theme, system, on-surface),
sidenav-content-background-color: inspection.get-theme-color($theme, background, background),
sidenav-content-background-color: inspection.get-theme-color($theme, system, background),
sidenav-content-text-color: inspection.get-theme-color($theme, system, on-surface),

// We use invert() here to have the darken the background color expected to be used.
Expand Down
Loading