feat(fab): Use new mdc-states mixin for fab styles (#1669)

material-components · Dec 5, 2017 · 9ab48b7 · 9ab48b7
1 parent 5065576
commit 9ab48b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/packages/mdc-fab/_mixins.scss b/packages/mdc-fab/_mixins.scss
@@ -27,10 +27,10 @@
 
   @if ($fill-tone == "dark") {
     @include mdc-fab-ink-color(text-primary-on-dark);
-    @include mdc-ripple-color(text-primary-on-dark, $mdc-ripple-pressed-light-ink-opacity);
+    @include mdc-states(text-primary-on-dark);
   } @else {
     @include mdc-fab-ink-color(text-primary-on-light);
-    @include mdc-ripple-color(text-primary-on-light, $mdc-ripple-pressed-dark-ink-opacity);
+    @include mdc-states(text-primary-on-light);
   }
 }
 

diff --git a/packages/mdc-fab/mdc-fab.scss b/packages/mdc-fab/mdc-fab.scss
@@ -22,11 +22,7 @@
   @include mdc-fab-base_;
   @include mdc-fab-container-color(secondary);
   @include mdc-fab-ink-color(text-primary-on-secondary);
-  @include mdc-ripple-color(text-primary-on-secondary, $mdc-ripple-pressed-dark-ink-opacity);
-
-  &:not(.mdc-ripple-upgraded) {
-    -webkit-tap-highlight-color: rgba(0, 0, 0, .18);
-  }
+  @include mdc-states(text-primary-on-secondary);
 }
 
 .mdc-fab--mini {