From 9a1fca4925894013c7000349cab315fc5a4d0afe Mon Sep 17 00:00:00 2001 From: "DESKTOP\\paul" Date: Thu, 4 Oct 2018 11:46:17 +0200 Subject: [PATCH 1/2] fix(menu-button): Correct color if toolbar has custom color --- core/src/components/menu-button/menu-button.ios.scss | 2 +- core/src/components/menu-button/menu-button.md.scss | 3 +++ core/src/components/menu-button/menu-button.scss | 9 +++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/core/src/components/menu-button/menu-button.ios.scss b/core/src/components/menu-button/menu-button.ios.scss index 310e46c9626..a36db107d3f 100644 --- a/core/src/components/menu-button/menu-button.ios.scss +++ b/core/src/components/menu-button/menu-button.ios.scss @@ -5,7 +5,7 @@ // -------------------------------------------------- :host { - color: #{ion-color(primary, base)}; + --color: #{$menu-button-ios-color}; } :host(.activated) { diff --git a/core/src/components/menu-button/menu-button.md.scss b/core/src/components/menu-button/menu-button.md.scss index b0c077d4cde..bf4952a1082 100644 --- a/core/src/components/menu-button/menu-button.md.scss +++ b/core/src/components/menu-button/menu-button.md.scss @@ -3,6 +3,9 @@ // MD Menu Button // -------------------------------------------------- +:host { + --color: #{$back-button-md-color}; +} button { @include padding(0, 8px); diff --git a/core/src/components/menu-button/menu-button.scss b/core/src/components/menu-button/menu-button.scss index e51fd91afac..a1e683bd486 100644 --- a/core/src/components/menu-button/menu-button.scss +++ b/core/src/components/menu-button/menu-button.scss @@ -4,6 +4,8 @@ // -------------------------------------------------- :host { + color: var(--color); + pointer-events: all; text-align: center; @@ -52,3 +54,10 @@ ion-icon { pointer-events: none; } + +// Menu Button with Color +// -------------------------------------------------- + +:host(.ion-color) .button-native { + color: current-color(base); +} \ No newline at end of file From 7d033a670fbbe806ba471371bad82a951917a405 Mon Sep 17 00:00:00 2001 From: "DESKTOP\\paul" Date: Thu, 4 Oct 2018 11:48:49 +0200 Subject: [PATCH 2/2] fix(menu-button): Fix variable name --- core/src/components/menu-button/menu-button.md.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/components/menu-button/menu-button.md.scss b/core/src/components/menu-button/menu-button.md.scss index bf4952a1082..d1c791ccfad 100644 --- a/core/src/components/menu-button/menu-button.md.scss +++ b/core/src/components/menu-button/menu-button.md.scss @@ -4,7 +4,7 @@ // MD Menu Button // -------------------------------------------------- :host { - --color: #{$back-button-md-color}; + --color: #{$menu-button-md-color}; } button {