From a91ae72598e86619ee390d429ade1b2f06e9651c Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Fri, 17 Feb 2017 00:43:40 +0100 Subject: [PATCH] fix(ripple): fix ripple color in dark theme (#3094) * Fixes the incorrect color for ripple elements in dark-themes. --- src/lib/core/ripple/_ripple.scss | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/lib/core/ripple/_ripple.scss b/src/lib/core/ripple/_ripple.scss index cbfb5d6eb8f..7f0d189b068 100644 --- a/src/lib/core/ripple/_ripple.scss +++ b/src/lib/core/ripple/_ripple.scss @@ -1,6 +1,6 @@ @import '../theming/theming'; -$mat-ripple-element-color: rgba(0, 0, 0, 0.1); +$mat-ripple-color-opacity: 0.1; @mixin mat-ripple() { // The host element of an md-ripple directive should always have a position of "absolute" or @@ -18,14 +18,20 @@ $mat-ripple-element-color: rgba(0, 0, 0, 0.1); border-radius: 50%; pointer-events: none; - background-color: $mat-ripple-element-color; - transition: opacity, transform 0ms cubic-bezier(0, 0, 0.2, 1); transform: scale(0); } } -@mixin mat-ripple-theme($theme) {} +/* Theme for the ripple elements.*/ +@mixin mat-ripple-theme($theme) { + $foreground: map_get($theme, foreground); + $foreground-base: map_get($foreground, base); + + .mat-ripple-element { + background-color: rgba($foreground-base, $mat-ripple-color-opacity); + } +} // A mixin, which generates temporary ink ripple on a given component.