From d2bb70eecd7f8f1c3ad0040e5d7bcba01b2cdeac Mon Sep 17 00:00:00 2001 From: Will Howell Date: Wed, 14 Jun 2017 17:48:50 -0400 Subject: [PATCH 1/3] Cleanup harsh colors for selected button toggle - Light theme: black -> black-54 - Dark theme: white -> white-70 --- src/lib/button-toggle/_button-toggle-theme.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/button-toggle/_button-toggle-theme.scss b/src/lib/button-toggle/_button-toggle-theme.scss index f17e89722399..83715baa6f7c 100644 --- a/src/lib/button-toggle/_button-toggle-theme.scss +++ b/src/lib/button-toggle/_button-toggle-theme.scss @@ -25,7 +25,7 @@ .mat-button-toggle-checked { background-color: mat-color($background, selected-button); - color: mat-color($foreground, base); + color: mat-color($foreground, secondary-text); } .mat-button-toggle-disabled { From 3474aa232338efb7064469775b9662772fdbeb41 Mon Sep 17 00:00:00 2001 From: Will Howell Date: Wed, 14 Jun 2017 18:25:39 -0400 Subject: [PATCH 2/3] Make the slider min thumb less harsh in light theme - Light theme: black -> black-87 - Dark theme: white -> white --- src/lib/core/theming/_palette.scss | 2 ++ src/lib/slider/_slider-theme.scss | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/core/theming/_palette.scss b/src/lib/core/theming/_palette.scss index e27ff7910f40..d48c081af780 100644 --- a/src/lib/core/theming/_palette.scss +++ b/src/lib/core/theming/_palette.scss @@ -690,6 +690,7 @@ $mat-light-theme-foreground: ( icon: rgba(black, 0.54), icons: rgba(black, 0.54), text: rgba(black, 0.87), + slider-min: rgba(black, 0.87), slider-off: rgba(black, 0.26), slider-off-active: rgba(black, 0.38), ); @@ -707,6 +708,7 @@ $mat-dark-theme-foreground: ( icon: white, icons: white, text: white, + slider-min: white, slider-off: rgba(white, 0.3), slider-off-active: rgba(white, 0.3), ); diff --git a/src/lib/slider/_slider-theme.scss b/src/lib/slider/_slider-theme.scss index 610c1e76e26e..b135a0ce71e0 100644 --- a/src/lib/slider/_slider-theme.scss +++ b/src/lib/slider/_slider-theme.scss @@ -24,7 +24,7 @@ $mat-slider-off-color: mat-color($foreground, slider-off); $mat-slider-off-focused-color: mat-color($foreground, slider-off-active); $mat-slider-disabled-color: mat-color($foreground, slider-off); - $mat-slider-labeled-min-value-thumb-color: mat-color($foreground, base); + $mat-slider-labeled-min-value-thumb-color: mat-color($foreground, slider-min); $mat-slider-labeled-min-value-thumb-label-color: mat-color($foreground, slider-off); $mat-slider-focus-ring-color: mat-color($accent, default, 0.2); $mat-slider-focus-ring-min-value-color: mat-color($foreground, base, 0.12); From 89c30c4e6e513f0f2ac37603f5d755021b7313af Mon Sep 17 00:00:00 2001 From: Will Howell Date: Wed, 14 Jun 2017 18:29:46 -0400 Subject: [PATCH 3/3] Use default text color for expansion panel --- src/lib/expansion/_expansion-theme.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/expansion/_expansion-theme.scss b/src/lib/expansion/_expansion-theme.scss index 2ed9552afdc4..75652b04f618 100644 --- a/src/lib/expansion/_expansion-theme.scss +++ b/src/lib/expansion/_expansion-theme.scss @@ -7,14 +7,14 @@ .mat-expansion-panel { background: mat-color($background, card); - color: mat-color($foreground, base); + color: mat-color($foreground, text); } .mat-action-row { border-top-color: mat-color($foreground, divider); } - .mat-expansion-panel-header:focus, + .mat-expansion-panel-header:focus, .mat-expansion-panel-header:hover { background: mat-color($background, hover); }