From 95945c05a5c9db556bb597cd600c17db41b06081 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Wed, 24 Apr 2019 11:36:12 -0400 Subject: [PATCH] fix(item): use the global activated background for md ripple color (#16752) fixes #16585 --- .../src/components/fab-button/fab-button.scss | 22 +++++++++---------- core/src/components/item/item.scss | 2 +- .../themes/test/css-variables/css/dark.css | 3 +++ .../themes/test/css-variables/css/vibrant.css | 1 + core/src/themes/test/css-variables/index.html | 4 ++-- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/core/src/components/fab-button/fab-button.scss b/core/src/components/fab-button/fab-button.scss index 2dbae897ae..e4f49a24c2 100755 --- a/core/src/components/fab-button/fab-button.scss +++ b/core/src/components/fab-button/fab-button.scss @@ -4,17 +4,6 @@ // -------------------------------------------------- :host { - --transition: background-color, opacity 100ms linear; - --ripple-color: currentColor; - --border-radius: #{$fab-border-radius}; - --border-width: 0; - --border-style: none; - --border-color: initial; - --padding-top: 0; - --padding-end: 0; - --padding-bottom: 0; - --padding-start: 0; - /** * @prop --background: Background of the button * @prop --background-activated: Background of the button when activated @@ -40,6 +29,17 @@ * @prop --padding-bottom: Padding bottom of the button * @prop --padding-start: Padding start of the button */ + --transition: background-color, opacity 100ms linear; + --ripple-color: currentColor; + --border-radius: #{$fab-border-radius}; + --border-width: 0; + --border-style: none; + --border-color: initial; + --padding-top: 0; + --padding-end: 0; + --padding-bottom: 0; + --padding-start: 0; + @include margin(0); display: block; diff --git a/core/src/components/item/item.scss b/core/src/components/item/item.scss index d51979097d..13224ffde3 100644 --- a/core/src/components/item/item.scss +++ b/core/src/components/item/item.scss @@ -57,7 +57,7 @@ --detail-icon-color: initial; --detail-icon-font-size: 20px; --detail-icon-opacity: 0.25; - --ripple-color: currentColor; + --ripple-color: var(--ion-item-background-activated, currentColor); @include font-smoothing(); diff --git a/core/src/themes/test/css-variables/css/dark.css b/core/src/themes/test/css-variables/css/dark.css index 1d3681a34c..ae546c2485 100644 --- a/core/src/themes/test/css-variables/css/dark.css +++ b/core/src/themes/test/css-variables/css/dark.css @@ -24,4 +24,7 @@ --ion-background-color-rgb: 23,23,23; --ion-background-color-rgb: 0,0,0; --ion-text-color-rgb: 255,255,255; + + --ion-item-background: #1b2025; + --ion-item-background-activated: #051b35; } diff --git a/core/src/themes/test/css-variables/css/vibrant.css b/core/src/themes/test/css-variables/css/vibrant.css index 11fb1a06da..4ce5c75391 100644 --- a/core/src/themes/test/css-variables/css/vibrant.css +++ b/core/src/themes/test/css-variables/css/vibrant.css @@ -77,4 +77,5 @@ --ion-background-color: #778899; --ion-item-background: #fff; --ion-item-border-color: #5bff76; + --ion-item-background-activated: #5bff76; } \ No newline at end of file diff --git a/core/src/themes/test/css-variables/index.html b/core/src/themes/test/css-variables/index.html index 2b54ec52a2..b879675856 100644 --- a/core/src/themes/test/css-variables/index.html +++ b/core/src/themes/test/css-variables/index.html @@ -141,11 +141,11 @@ Super Metroid Note - + Mega Man X Note - + The Legend of Zelda Note