From 427dce07319a97a9b23d7143ad7d719372acf302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreira?= Date: Thu, 30 Oct 2025 18:13:28 +0000 Subject: [PATCH] - fix outline and clear colors and ripple-effect; --- core/src/components/button/button.ionic.scss | 33 ++++++++++++++----- .../button/test/theme-ionic/index.html | 3 +- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/core/src/components/button/button.ionic.scss b/core/src/components/button/button.ionic.scss index 4e1cd8ec3f..075262e8bf 100644 --- a/core/src/components/button/button.ionic.scss +++ b/core/src/components/button/button.ionic.scss @@ -59,39 +59,56 @@ :host(.button-outline) { --border-width: #{globals.$ion-border-size-025}; --border-style: #{globals.$ion-border-style-solid}; - --background-activated: #{globals.$ion-bg-neutral-subtlest-press}; + --background-activated: var(--ion-color-subtle-shade, #{globals.current-color(shade, $subtle: true)}); --background-focused: transparent; - --background-hover: #{globals.$ion-bg-neutral-subtlest-press}; + --background-hover: var(--ion-color-subtle-shade, #{globals.current-color(shade, $subtle: true)}); --background-hover-opacity: 1; - --border-color: #{globals.ion-color(primary, base)}; - --color: #{globals.ion-color(primary, base)}; + --border-color: var(--ion-color-base, #{globals.ion-color(primary, base)}); + --color: var(--ion-color-base, #{globals.ion-color(primary, base)}); --ripple-opacity: var(--background-activated-opacity, 1); --ripple-color: var(--background-activated); } +// Provide fallbacks for ion-color-base for all colors +:host(.button-outline.ion-color.ion-color-warning){ + .button-native { + --ion-color-base: #{globals.$ion-text-warning}; + } + ion-ripple-effect { + --ion-color-base: var(--ion-color-base, #{globals.current-color(shade, $subtle: true)}); + } +} + + // Clear Button // -------------------------------------------------- :host(.button-clear) { - --background-activated: #{globals.$ion-bg-neutral-subtlest-press}; + --background-activated: var(--ion-color-subtle-shade, #{globals.current-color( shade, $subtle: true)}); --background-focused: transparent; - --background-hover: #{globals.$ion-bg-neutral-subtlest-press}; + --background-hover: var(--ion-color-subtle-shade, #{globals.current-color( shade, $subtle: true)}); --background-hover-opacity: 1; --color: #{globals.ion-color(primary, foreground)}; --ripple-opacity: var(--background-activated-opacity, 1); --ripple-color: var(--background-activated); } +:host(.button-clear.ion-color) { + .button-native { + --ion-color-base: var(--ion-color-foreground, #{globals.current-color(foreground)}); + } +} + // Ripple Effect // ------------------------------------------------------------------------------- :host(.button-solid.ion-color) ion-ripple-effect { - color: globals.current-color(shade); + color: var(--ion-color-shade, #{globals.ion-color(primary, shade)}); } :host(.button-outline.ion-color) ion-ripple-effect, :host(.button-clear.ion-color) ion-ripple-effect { - color: globals.$ion-primitives-neutral-200; + color: var(--ion-color-subtle-shade, #{globals.current-color(shade, $subtle: true)}); } // Button Sizes diff --git a/core/src/components/button/test/theme-ionic/index.html b/core/src/components/button/test/theme-ionic/index.html index 51823c2875..2449b48205 100644 --- a/core/src/components/button/test/theme-ionic/index.html +++ b/core/src/components/button/test/theme-ionic/index.html @@ -56,7 +56,8 @@ Primary Success Warning - Neutral + Medium + Danger