Skip to content

Commit

Permalink
Address feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
devversion committed Mar 29, 2017
1 parent 6f4950a commit 94e2411
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions src/lib/button/_button-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,21 @@
}
}

@mixin _mat-button-ripple-color($theme, $hue: default) {
@mixin _mat-button-ripple-color($theme, $hue, $opacity: 0.2) {
$primary: map-get($theme, primary);
$accent: map-get($theme, accent);
$warn: map-get($theme, warn);

&.mat-primary .mat-ripple-element {
background-color: mat-color($primary, $hue, 0.26);
background-color: mat-color($primary, $hue, $opacity);
}

&.mat-accent .mat-ripple-element {
background-color: mat-color($accent, $hue, 0.26);
background-color: mat-color($accent, $hue, $opacity);
}

&.mat-warn .mat-ripple-element {
background-color: mat-color($warn, $hue, 0.26);
background-color: mat-color($warn, $hue, $opacity);
}
}

Expand Down Expand Up @@ -75,19 +75,17 @@
$foreground: map-get($theme, foreground);

.mat-button, .mat-icon-button, .mat-raised-button, .mat-fab, .mat-mini-fab {
// Appy color to focus overlay.
// 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 {
@include _mat-button-theme-color($theme, 'color');
background: transparent;
}

.mat-icon-button {
@include _mat-button-ripple-color($theme);
@include _mat-button-theme-color($theme, 'color');
@include _mat-button-ripple-color($theme, default, 0.1);
}

.mat-raised-button, .mat-fab, .mat-mini-fab {
Expand All @@ -108,7 +106,7 @@
// Button fab elements are using the accent palette by default. The color classes won't
// be set on the element. To have a proper ripple color for those, we set the ripple color.
.mat-ripple-element {
background-color: mat-color($accent, default-contrast, 0.26);
background-color: mat-color($accent, default-contrast, 0.2);
}
}
}
Expand Down

0 comments on commit 94e2411

Please sign in to comment.