From 0c83fd3f1af3b8e7d0485a7d9c9f18d4f9b944bf Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Mon, 6 May 2019 11:14:43 -0400 Subject: [PATCH] fix(toast): allow button-color CSS variable to be overridden (#18133) fixes #18127 --- core/src/components/toast/toast.ios.scss | 1 - core/src/components/toast/toast.ios.vars.scss | 7 ++----- core/src/components/toast/toast.md.scss | 1 - core/src/components/toast/toast.md.vars.scss | 3 --- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/core/src/components/toast/toast.ios.scss b/core/src/components/toast/toast.ios.scss index 23df12363b..fd3f95a2b4 100644 --- a/core/src/components/toast/toast.ios.scss +++ b/core/src/components/toast/toast.ios.scss @@ -69,7 +69,6 @@ border: 0; background-color: $toast-ios-button-background-color; - color: $toast-ios-button-text-color; font-family: var(--ion-font-family); font-size: $toast-ios-button-font-size; diff --git a/core/src/components/toast/toast.ios.vars.scss b/core/src/components/toast/toast.ios.vars.scss index a8762f2e78..74c050c9cc 100644 --- a/core/src/components/toast/toast.ios.vars.scss +++ b/core/src/components/toast/toast.ios.vars.scss @@ -39,8 +39,8 @@ $toast-ios-content-padding-bottom: $toast-ios-content-padding-top /// @prop - Padding start of the toast content $toast-ios-content-padding-start: $toast-ios-content-padding-end !default; -/// @prop - Color of the toast button -$toast-ios-button-color: $text-color-step-400 !default; +/// @prop - Color of the toast button +$toast-ios-button-color: #{ion-color(primary, base)} !default; /// @prop - Filter of the translucent toast $toast-ios-translucent-filter: saturate(180%) blur(20px) !default; @@ -66,9 +66,6 @@ $toast-ios-button-font-size: 17px !default; /// @prop - Font size of the toast button $toast-ios-button-font-weight: 500 !default; -/// @prop - Color of the text in the toast button -$toast-ios-button-text-color: ion-color(primary, base) !default; - /// @prop - Background color alpha of the toast activated button $toast-ios-button-opacity-activated: .4 !default; diff --git a/core/src/components/toast/toast.md.scss b/core/src/components/toast/toast.md.scss index b31e64432f..7581c4b8af 100644 --- a/core/src/components/toast/toast.md.scss +++ b/core/src/components/toast/toast.md.scss @@ -64,7 +64,6 @@ position: relative; background-color: $toast-md-button-background-color; - color: $toast-md-button-text-color; font-family: var(--ion-font-family); font-size: $toast-md-button-font-size; diff --git a/core/src/components/toast/toast.md.vars.scss b/core/src/components/toast/toast.md.vars.scss index 0bdea72ff0..2fdd98f2b0 100644 --- a/core/src/components/toast/toast.md.vars.scss +++ b/core/src/components/toast/toast.md.vars.scss @@ -63,9 +63,6 @@ $toast-md-button-font-weight: 500 !default; /// @prop - Letter spacing of the toast button $toast-md-button-letter-spacing: 0.84px !default; -/// @prop - Text color of the toast button -$toast-md-button-text-color: ion-color(primary, base) !default; - /// @prop - Background color of the toast button $toast-md-button-background-color: transparent !default;