Skip to content

refactor: merge light and dark fore- and back- palettes #31040

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: merge light and dark fore- and back- palettes #31040

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
57 changes: 57 additions & 0 deletions src/material/core/m2/_palette.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,3 +746,60 @@ $dark-theme-foreground-palette: (
slider-off: rgba(white, 0.3),
slider-off-active: rgba(white, 0.3),
);

@function get-foreground-palette($is-dark) {
$base: if($is-dark, white, black);
@return (
base: $base,
divider: rgba($base, 0.12),
disabled: rgba($base, if($is-dark, 0.5, 0.38)),
disabled-button: rgba($base, if($is-dark, 0.3, 0.26)),
disabled-text: rgba($base, if($is-dark, 0.5, 0.38)),
elevation: black,
hint-text: rgba($base, if($is-dark, 0.5, 0.38)),
secondary-text: rgba($base, if($is-dark, 0.7, 0.54)),
text: if($is-dark, white, rgba(black, 0.87)),

// Unused but provided for backwards compatibility
dividers: rgba($base, 0.12),
icons: if($is-dark, white, rgba(black, 0.54)),
slider-min: if($is-dark, white, rgba(black, 0.87)),
slider-off: rgba($base, if($is-dark, 0.3, 0.26)),
slider-off-active: rgba($base, if($is-dark, 0.3, 0.38)),
);
}

@function get-background-palette($is-dark) {
$base: if($is-dark, white, black);
$grey-50: map.get($grey-palette, 50);
$grey-100: map.get($grey-palette, 100);
$grey-200: map.get($grey-palette, 200);
$grey-300: map.get($grey-palette, 300);
$grey-400: map.get($grey-palette, 400);
$grey-700: map.get($grey-palette, 700);
$grey-800: map.get($grey-palette, 800);
$grey-900: map.get($grey-palette, 900);

$surface: if($is-dark, $grey-800, white);
$white-black: if($is-dark, white, black);

@return (
card: $surface,
dialog: $surface,
status-bar: if($is-dark, black, $grey-300),
app-bar: if($is-dark, $grey-900, $grey-100),
background: if($is-dark, #303030, $grey-50),
hover: rgba($white-black, 0.04),
disabled-button: rgba($white-black, 0.12),
focused-button: rgba($white-black, 0.12),
selected-button: if($is-dark, $grey-900, $grey-300),
unselected-chip: if($is-dark, $grey-700, $grey-300),
disabled-list-option: if($is-dark, rgba(white, 0.12), $grey-200),
tooltip: $grey-700,

// Unused but provided for backwards compatibility
raised-button: $surface,
selected-disabled-button: if($is-dark, $grey-800, $grey-400),
disabled-button-toggle: if($is-dark, black, $grey-200),
);
}
8 changes: 4 additions & 4 deletions src/material/core/m2/_theming.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@
accent: $accent,
warn: if($warn != null, $warn, define-palette(palette.$red-palette)),
is-dark: false,
foreground: palette.$light-theme-foreground-palette,
background: palette.$light-theme-background-palette
foreground: palette.get-foreground-palette($is-dark: false),
background: palette.get-background-palette($is-dark: false),
);
}

Expand All @@ -132,8 +132,8 @@
accent: $accent,
warn: if($warn != null, $warn, define-palette(palette.$red-palette)),
is-dark: true,
foreground: palette.$dark-theme-foreground-palette,
background: palette.$dark-theme-background-palette
foreground: palette.get-foreground-palette($is-dark: true),
background: palette.get-background-palette($is-dark: true),
);
}

Expand Down
Loading