From 9ab48b7a05441b75b504162b3271c70bd2bd9ba7 Mon Sep 17 00:00:00 2001 From: "Kenneth G. Franqueiro" Date: Tue, 5 Dec 2017 15:28:17 -0500 Subject: [PATCH] feat(fab): Use new mdc-states mixin for fab styles (#1669) --- packages/mdc-fab/_mixins.scss | 4 ++-- packages/mdc-fab/mdc-fab.scss | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/mdc-fab/_mixins.scss b/packages/mdc-fab/_mixins.scss index be907c0b1e6..65c562c1df5 100644 --- 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 index 535481e7d2e..ac220794d44 100644 --- 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 {