From cbb628b9356c8395b26604f0423ab47173466ef1 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Fri, 28 Aug 2015 20:57:50 -0500 Subject: [PATCH] action menu animation improvements --- ionic/components/action-menu/action-menu.scss | 1 + ionic/components/action-menu/action-menu.ts | 12 ++++++------ ionic/components/app/structure.scss | 4 ++++ ionic/util/util.scss | 3 ++- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ionic/components/action-menu/action-menu.scss b/ionic/components/action-menu/action-menu.scss index d179b53754..371ff02a46 100644 --- a/ionic/components/action-menu/action-menu.scss +++ b/ionic/components/action-menu/action-menu.scss @@ -30,6 +30,7 @@ action-menu-wrapper { left: 0; right: 0; width: 100%; + display: block; max-width: 500px; margin: auto; diff --git a/ionic/components/action-menu/action-menu.ts b/ionic/components/action-menu/action-menu.ts index b43055a938..e6c305200c 100644 --- a/ionic/components/action-menu/action-menu.ts +++ b/ionic/components/action-menu/action-menu.ts @@ -86,7 +86,7 @@ export class ActionMenu extends Overlay { /** * TODO - * @returns {TODO} TODO + * @returns {TODO} TODO */ get() { return Modal.getByType(OVERLAY_TYPE); @@ -103,7 +103,7 @@ const OVERLAY_TYPE = 'action-menu'; class ActionMenuAnimation extends Animation { constructor(element) { super(element); - this.easing('cubic-bezier(.36, .66, .04, 1)').duration(400); + this.easing('cubic-bezier(.36, .66, .04, 1)').duration(450); this.backdrop = new Animation(element.querySelector('backdrop')); this.wrapper = new Animation(element.querySelector('action-menu-wrapper')); @@ -115,7 +115,7 @@ class ActionMenuAnimation extends Animation { class ActionMenuSlideIn extends ActionMenuAnimation { constructor(element) { super(element); - this.backdrop.fromTo('opacity', 0, 0.4); + this.backdrop.fromTo('opacity', 0.01, 0.4); this.wrapper.fromTo('translateY', '100%', '0%'); } } @@ -124,7 +124,7 @@ Animation.register('action-menu-slide-in', ActionMenuSlideIn); class ActionMenuSlideOut extends ActionMenuAnimation { constructor(element) { super(element); - this.backdrop.fromTo('opacity', 0.4, 0); + this.backdrop.fromTo('opacity', 0.4, 0.01); this.wrapper.fromTo('translateY', '0%', '100%'); } } @@ -134,7 +134,7 @@ Animation.register('action-menu-slide-out', ActionMenuSlideOut); class ActionMenuMdSlideIn extends ActionMenuSlideIn { constructor(element) { super(element); - this.backdrop.fromTo('opacity', 0, 0.26); + this.backdrop.fromTo('opacity', 0.01, 0.26); } } Animation.register('action-menu-md-slide-in', ActionMenuMdSlideIn); @@ -142,7 +142,7 @@ Animation.register('action-menu-md-slide-in', ActionMenuMdSlideIn); class ActionMenuMdSlideOut extends ActionMenuSlideOut { constructor(element) { super(element); - this.backdrop.fromTo('opacity', 0.26, 0); + this.backdrop.fromTo('opacity', 0.01.26, 0); } } Animation.register('action-menu-md-slide-out', ActionMenuMdSlideOut); diff --git a/ionic/components/app/structure.scss b/ionic/components/app/structure.scss index b22c2e8d59..0b03658e7d 100644 --- a/ionic/components/app/structure.scss +++ b/ionic/components/app/structure.scss @@ -81,3 +81,7 @@ ion-pane { flex: 1; order: $flex-order-view-content; } + +root-anchor { + display: none; +} diff --git a/ionic/util/util.scss b/ionic/util/util.scss index 9d86775a70..aa2513ca80 100755 --- a/ionic/util/util.scss +++ b/ionic/util/util.scss @@ -100,7 +100,8 @@ backdrop { width: 100%; height: 100%; background-color: $backdrop-color; - opacity: 0; + opacity: 0.01; + display: block; transform: translateZ(0); }