From 386cf823406c1dee896f07c4efcd98fa455b74a1 Mon Sep 17 00:00:00 2001 From: "Manu Mtz.-Almeida" Date: Mon, 8 Oct 2018 16:12:15 -0500 Subject: [PATCH] fix(menu-button): color fixes #15546 fixes #15545 --- core/src/components/menu-button/menu-button.ios.scss | 3 +-- .../components/menu-button/menu-button.ios.vars.scss | 10 ---------- core/src/components/menu-button/menu-button.md.scss | 4 ++-- .../components/menu-button/menu-button.md.vars.scss | 7 ------- core/src/components/menu-button/menu-button.scss | 4 ++-- 5 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 core/src/components/menu-button/menu-button.ios.vars.scss delete mode 100644 core/src/components/menu-button/menu-button.md.vars.scss diff --git a/core/src/components/menu-button/menu-button.ios.scss b/core/src/components/menu-button/menu-button.ios.scss index a36db107d3..58df4360f2 100644 --- a/core/src/components/menu-button/menu-button.ios.scss +++ b/core/src/components/menu-button/menu-button.ios.scss @@ -1,11 +1,10 @@ @import "./menu-button"; -@import "./menu-button.ios.vars"; // iOS Menu Button // -------------------------------------------------- :host { - --color: #{$menu-button-ios-color}; + --color: #{ion-color(primary, base)}; } :host(.activated) { diff --git a/core/src/components/menu-button/menu-button.ios.vars.scss b/core/src/components/menu-button/menu-button.ios.vars.scss deleted file mode 100644 index 13483851bc..0000000000 --- a/core/src/components/menu-button/menu-button.ios.vars.scss +++ /dev/null @@ -1,10 +0,0 @@ -@import "../../themes/ionic.globals.ios"; - -// iOS Menu Button -// -------------------------------------------------- - -/// @prop - Z index of the Menu button -$menu-button-ios-button-z-index: $z-index-toolbar-buttons !default; - -/// @prop - Text color of the Menu button -$menu-button-ios-color: ion-color(primary, base) !default; diff --git a/core/src/components/menu-button/menu-button.md.scss b/core/src/components/menu-button/menu-button.md.scss index d1c791ccfa..a988540b1b 100644 --- a/core/src/components/menu-button/menu-button.md.scss +++ b/core/src/components/menu-button/menu-button.md.scss @@ -1,10 +1,10 @@ @import "./menu-button"; -@import "./menu-button.md.vars"; // MD Menu Button // -------------------------------------------------- + :host { - --color: #{$menu-button-md-color}; + --color: currentColor; } button { diff --git a/core/src/components/menu-button/menu-button.md.vars.scss b/core/src/components/menu-button/menu-button.md.vars.scss deleted file mode 100644 index 0a9c34ae89..0000000000 --- a/core/src/components/menu-button/menu-button.md.vars.scss +++ /dev/null @@ -1,7 +0,0 @@ -@import "../../themes/ionic.globals.md"; - -// Material Design Menu Button -// -------------------------------------------------- - -/// @prop - Text color of the Menu button -$menu-button-md-color: $toolbar-md-text-color !default; diff --git a/core/src/components/menu-button/menu-button.scss b/core/src/components/menu-button/menu-button.scss index a1e683bd48..b824495a32 100644 --- a/core/src/components/menu-button/menu-button.scss +++ b/core/src/components/menu-button/menu-button.scss @@ -5,7 +5,7 @@ :host { color: var(--color); - + pointer-events: all; text-align: center; @@ -60,4 +60,4 @@ ion-icon { :host(.ion-color) .button-native { color: current-color(base); -} \ No newline at end of file +}