From dfb4fe2134633a3f0334d2c77dfb0c0931d8400d Mon Sep 17 00:00:00 2001 From: "Manu Mtz.-Almeida" Date: Mon, 12 Feb 2018 13:48:02 +0100 Subject: [PATCH] fix(toast): ios color --- packages/core/src/components/menu/menu.tsx | 8 ++++---- packages/core/src/components/toast/toast.ios.vars.scss | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/core/src/components/menu/menu.tsx b/packages/core/src/components/menu/menu.tsx index ed8f2bb00e..160d648f94 100644 --- a/packages/core/src/components/menu/menu.tsx +++ b/packages/core/src/components/menu/menu.tsx @@ -1,4 +1,4 @@ -import { Component, Element, Event, EventEmitter, Listen, Method, Prop, State, Watch } from '@stencil/core'; +import { Component, Element, Event, EventEmitter, EventListenerEnable, Listen, Method, Prop, State, Watch } from '@stencil/core'; import { Animation, Config, GestureDetail, SplitPaneAlert } from '../../index'; import { Side, assert, checkEdgeSide, isRightSide } from '../../utils/helpers'; @@ -36,7 +36,7 @@ export class Menu { @Prop({ context: 'config' }) config: Config; @Prop({ connect: 'ion-menu-controller' }) lazyMenuCtrl: HTMLIonMenuControllerElement; - @Prop({ context: 'enableListener' }) enableListener: any; + @Prop({ context: 'enableListener' }) enableListener: EventListenerEnable; /** * The content's id the menu should use. @@ -386,7 +386,7 @@ export class Menu { this.contentEl.classList.add(MENU_CONTENT_OPEN); // emit open event - this.ionOpen.emit({ menu: this }); + this.ionOpen.emit({ menu: this.el }); } else { // enable swipe to go back gesture @@ -398,7 +398,7 @@ export class Menu { this.backdropEl.classList.remove(SHOW_BACKDROP); // emit close event - this.ionClose.emit({ menu: this }); + this.ionClose.emit({ menu: this.el }); } return isOpen; } diff --git a/packages/core/src/components/toast/toast.ios.vars.scss b/packages/core/src/components/toast/toast.ios.vars.scss index 6abc2b0cd4..3c9361fb9f 100644 --- a/packages/core/src/components/toast/toast.ios.vars.scss +++ b/packages/core/src/components/toast/toast.ios.vars.scss @@ -7,7 +7,7 @@ $toast-ios-font-family: $font-family-ios-base !default; /// @prop - Background Color of the toast wrapper -$toast-ios-background-color: $background-ios-color-step-50 !default; +$toast-ios-background-color: $text-ios-color-step-50 !default; /// @prop - Background Color of the toast wrapper when translucent $toast-ios-translucent-background-color: ion-color-alpha($background-ios-color-value, background-ios-color, $alpha-ios-high) !default; @@ -16,7 +16,7 @@ $toast-ios-translucent-background-color: ion-color-alpha($background-io $toast-ios-border-radius: 14px !default; /// @prop - Color of the toast title -$toast-ios-title-color: $text-ios-color-step-150 !default; +$toast-ios-title-color: $background-ios-color-step-150 !default; /// @prop - Font size of the toast title $toast-ios-title-font-size: 14px !default;