javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-22 21:48:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(toast): ios color

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-02-12 13:48:02 +01:00
parent fc01c0a15b
commit dfb4fe2134
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/core/src/components/menu/menu.tsx
View File

@ -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 { Animation, Config, GestureDetail, SplitPaneAlert } from '../../index';
import { Side, assert, checkEdgeSide, isRightSide } from '../../utils/helpers'; import { Side, assert, checkEdgeSide, isRightSide } from '../../utils/helpers';
@ -36,7 +36,7 @@ export class Menu {
@Prop({ context: 'config' }) config: Config; @Prop({ context: 'config' }) config: Config;
@Prop({ connect: 'ion-menu-controller' }) lazyMenuCtrl: HTMLIonMenuControllerElement; @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. * The content's id the menu should use.
@ -386,7 +386,7 @@ export class Menu {
this.contentEl.classList.add(MENU_CONTENT_OPEN); this.contentEl.classList.add(MENU_CONTENT_OPEN);
// emit open event // emit open event
this.ionOpen.emit({ menu: this }); this.ionOpen.emit({ menu: this.el });
} else { } else {
// enable swipe to go back gesture // enable swipe to go back gesture
@ -398,7 +398,7 @@ export class Menu {
this.backdropEl.classList.remove(SHOW_BACKDROP); this.backdropEl.classList.remove(SHOW_BACKDROP);
// emit close event // emit close event
this.ionClose.emit({ menu: this }); this.ionClose.emit({ menu: this.el });
} }
return isOpen; return isOpen;
} }

4
packages/core/src/components/toast/toast.ios.vars.scss
View File

@ -7,7 +7,7 @@
$toast-ios-font-family: $font-family-ios-base !default; $toast-ios-font-family: $font-family-ios-base !default;
/// @prop - Background Color of the toast wrapper /// @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 /// @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; $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; $toast-ios-border-radius: 14px !default;
/// @prop - Color of the toast title /// @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 /// @prop - Font size of the toast title
$toast-ios-title-font-size: 14px !default; $toast-ios-title-font-size: 14px !default;