Skip to content

fix(material/progress-bar): adjust buffer colors #22164

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

Merged
merged 2 commits into from
Mar 10, 2021
Merged

fix(material/progress-bar): adjust buffer colors #22164

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7eb2f6f
fix(material/progress-bar): adjust buffer colors
andrewseguin Mar 9, 2021
254d056
fix(material/progress-bar): use fallback for variables
andrewseguin Mar 9, 2021
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
26 changes: 20 additions & 6 deletions src/material/progress-bar/_progress-bar-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,33 @@
@use 'sass:map';
@use 'sass:meta';
@use 'sass:color';
@use '../core/theming/palette';
@use '../core/theming/theming';

// Approximates the correct buffer color by using a mix between the theme color
// and the theme's background color.
@function _get-buffer-color($theme, $background) {
$theme-color: theming.color($theme);
// Return fallback color if the theme uses variables to define colors.
@if (meta.type-of($theme-color) != 'color' or meta.type-of($background) != 'color') {
@return theming.color($theme, lighter);
}
@return color.mix($theme-color, $background, $weight: 25%);
}

@mixin color($config-or-theme) {
$config: theming.get-color-config($config-or-theme);
$primary: map.get($config, primary);
$accent: map.get($config, accent);
$warn: map.get($config, warn);
$background: map.get(map.get($config, background), background);

.mat-progress-bar-background {
fill: theming.color($primary, lighter);
fill: _get-buffer-color($primary, $background);
}

.mat-progress-bar-buffer {
background-color: theming.color($primary, lighter);
background-color: _get-buffer-color($primary, $background);
}

.mat-progress-bar-fill::after {
Expand All @@ -22,11 +36,11 @@

.mat-progress-bar.mat-accent {
.mat-progress-bar-background {
fill: theming.color($accent, lighter);
fill: _get-buffer-color($accent, $background);
}

.mat-progress-bar-buffer {
background-color: theming.color($accent, lighter);
background-color: _get-buffer-color($accent, $background);
}

.mat-progress-bar-fill::after {
Expand All @@ -36,11 +50,11 @@

.mat-progress-bar.mat-warn {
.mat-progress-bar-background {
fill: theming.color($warn, lighter);
fill: _get-buffer-color($warn, $background);
}

.mat-progress-bar-buffer {
background-color: theming.color($warn, lighter);
background-color: _get-buffer-color($warn, $background);
}

.mat-progress-bar-fill::after {
Expand Down