Skip to content

Commit

Permalink
Use correct focus overlay for raised buttons
Browse files Browse the repository at this point in the history
- Only uses themed overlay for flat buttons and flat icon buttons
- Dark overlay applies to all other buttons
- Fixes #3820
  • Loading branch information
willshowell committed Apr 27, 2017
1 parent 16bba72 commit 8b55f8c
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions src/lib/button/_button-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,10 @@
$background: map-get($theme, background);
$foreground: map-get($theme, foreground);

.mat-button, .mat-icon-button, .mat-raised-button, .mat-fab, .mat-mini-fab {
// Apply color to focus overlay.
// The focus overlay will be visible when any button type is focused or when
// flat buttons or icon buttons are hovered.
@include _mat-button-focus-color($theme);
}

.mat-button, .mat-icon-button {
background: transparent;

@include _mat-button-focus-color($theme);
@include _mat-button-theme-color($theme, 'color');
}

Expand All @@ -98,7 +92,7 @@
// Add ripple effect with contrast color to buttons that don't have a focus overlay.
@include _mat-button-ripple-color($theme, default-contrast);
}

// Add ripple effect with default color to flat buttons, which also have a focus overlay.
.mat-button {
@include _mat-button-ripple-color($theme, default, 0.1);
Expand Down

0 comments on commit 8b55f8c

Please sign in to comment.