Skip to content

fix(button-toggle): Use a lighter color for focused layer in button-toggle#3232

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
mmalerba merged 3 commits into from
Feb 23, 2017
+6 −4
Merged

fix(button-toggle): Use a lighter color for focused layer in button-toggle #3232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c10c4fb
Use a lighter color for focused layer in button-toggle
tinayuangao Feb 21, 2017
f70bb52
.
tinayuangao Feb 21, 2017
1f5dfb1
Only show focus layer when keyboard focus
tinayuangao Feb 22, 2017
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/lib/button-toggle/_button-toggle-theme.scss
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
$background: map-get($theme, background);

.mat-button-toggle-focus-overlay {
background-color: mat-color($background, dark-overlay);
background-color: mat-color($background, focused-button);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/lib/button-toggle/button-toggle.scss
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ $mat-button-toggle-border-radius: 2px !default;
position: relative;
}

.mat-button-toggle.cdk-focused .mat-button-toggle-focus-overlay {
.mat-button-toggle.cdk-keyboard-focused .mat-button-toggle-focus-overlay {
opacity: 1;
}

Expand Down
6 changes: 4 additions & 2 deletions src/lib/core/theming/_palette.scss
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,8 @@ $black-87-opacity: rgba(black, 0.87);
$white-87-opacity: rgba(white, 0.87);
$black-12-opacity: rgba(black, 0.12);
$white-12-opacity: rgba(white, 0.12);
$black-6-opacity: rgba(black, 0.06);
$white-6-opacity: rgba(white, 0.06);

$mat-red: (
50: #ffebee,
Expand DownExpand Up@@ -653,7 +655,7 @@ $mat-light-theme-background: (
dialog: white,
disabled-button: $black-12-opacity,
raised-button: white,
dark-overlay: $black-12-opacity,
focused-button: $black-6-opacity,
);

// Background palette for dark themes.
Expand All@@ -666,7 +668,7 @@ $mat-dark-theme-background: (
dialog: map_get($mat-grey, 800),
disabled-button: $white-12-opacity,
raised-button: map-get($mat-grey, 800),
dark-overlay: $white-12-opacity,
focused-button: $white-6-opacity,
);

// Foreground palette for light themes.
Expand Down