diff --git a/packages/core/src/components/menu-controller/animations/overlay.ts b/packages/core/src/components/menu-controller/animations/overlay.ts index 92fe268c45..6c582949c5 100644 --- a/packages/core/src/components/menu-controller/animations/overlay.ts +++ b/packages/core/src/components/menu-controller/animations/overlay.ts @@ -26,11 +26,11 @@ export default function(Animation: Animation, _: HTMLElement, menu: Menu): Anima .addElement(menu.menuInnerEl) .fromTo('translateX', closedX, openedX); - const backdropApi = new Animation() + const backdropAni = new Animation() .addElement(menu.backdropEl) - .fromTo('opacity', 0.01, 0.35); + .fromTo('opacity', 0.01, 0.3); return baseAnimation(Animation) .add(menuAni) - .add(backdropApi); + .add(backdropAni); } diff --git a/packages/core/src/components/menu-controller/animations/push.ts b/packages/core/src/components/menu-controller/animations/push.ts index 31b53e2237..cf25913af7 100644 --- a/packages/core/src/components/menu-controller/animations/push.ts +++ b/packages/core/src/components/menu-controller/animations/push.ts @@ -28,7 +28,12 @@ export default function(Animation: Animation, _: HTMLElement, menu: Menu): Anima .addElement(menu.contentEl) .fromTo('translateX', '0px', contentOpenedX); + const backdropAni = new Animation() + .addElement(menu.backdropEl) + .fromTo('opacity', 0.01, 0.2); + return baseAnimation(Animation) .add(menuAni) + .add(backdropAni) .add(contentAni); } diff --git a/packages/core/src/components/menu/menu.ios.scss b/packages/core/src/components/menu/menu.ios.scss index 3042b8aef5..97a29fb466 100644 --- a/packages/core/src/components/menu/menu.ios.scss +++ b/packages/core/src/components/menu/menu.ios.scss @@ -9,27 +9,47 @@ $menu-ios-background: $background-ios-color !default; /// @prop - Box shadow color of the menu -$menu-ios-box-shadow-color: rgba(0, 0, 0, .25) !default; +$menu-ios-box-shadow-color: rgba(0, 0, 0, .08) !default; /// @prop - Box shadow of the menu -$menu-ios-box-shadow: 0 0 10px $menu-ios-box-shadow-color !default; +$menu-ios-box-shadow: -8px 0px 42px $menu-ios-box-shadow-color !default; + +/// @prop - Box shadow of the reveal menu +$menu-ios-box-shadow-reveal: $menu-ios-box-shadow !default; + +/// @prop - Box shadow of the push menu +$menu-ios-box-shadow-push: null !default; + +/// @prop - Box shadow of the overlay menu +$menu-ios-box-shadow-overlay: null !default; .menu-ios .menu-inner { background: $menu-ios-background; } -.menu-ios.menu-type-overlay .menu-inner { - box-shadow: $menu-ios-box-shadow; +.app-ios .menu-type-overlay .menu-inner { + box-shadow: $menu-ios-box-shadow-overlay; } // iOS Menu Content // -------------------------------------------------- .app-ios .menu-content-reveal { - box-shadow: $menu-ios-box-shadow; + box-shadow: $menu-ios-box-shadow-reveal; } .app-ios .menu-content-push { - box-shadow: $menu-ios-box-shadow; + box-shadow: $menu-ios-box-shadow-push; } + +// iOS Menu Push +// -------------------------------------------------- + +.app-ios .menu-type-push { + z-index: $z-index-menu-overlay; +} + +.app-ios .menu-type-push .show-backdrop { + display: block; +} \ No newline at end of file