From 0c885899bca2b1e7ed6fa85377edb7ecf1a682b8 Mon Sep 17 00:00:00 2001 From: "Manu Mtz.-Almeida" Date: Thu, 16 Jun 2016 12:40:21 +0200 Subject: [PATCH] fix(menu): push/overlay working correctly in landscape --- src/components/menu/menu-types.ts | 11 ++++++----- src/components/menu/menu.scss | 10 ---------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/components/menu/menu-types.ts b/src/components/menu/menu-types.ts index fcf808fd281..19a3c08b377 100644 --- a/src/components/menu/menu-types.ts +++ b/src/components/menu/menu-types.ts @@ -98,9 +98,10 @@ class MenuPushType extends MenuType { let contentOpenedX: string, menuClosedX: string, menuOpenedX: string; if (menu.side === 'right') { + // right side contentOpenedX = -menu.width() + 'px'; - menuOpenedX = (platform.width() - menu.width()) + 'px'; - menuClosedX = platform.width() + 'px'; + menuClosedX = menu.width() + 'px'; + menuOpenedX = '0px'; } else { contentOpenedX = menu.width() + 'px'; @@ -137,13 +138,13 @@ class MenuOverlayType extends MenuType { let closedX: string, openedX: string; if (menu.side === 'right') { // right side - closedX = menu.width() + 'px'; + closedX = 8 + menu.width() + 'px'; openedX = '0px'; } else { // left side - closedX = -menu.width() + 'px'; - openedX = '8px'; + closedX = -(8 + menu.width()) + 'px'; + openedX = '0px'; } let menuAni = new Animation(menu.getMenuElement()); diff --git a/src/components/menu/menu.scss b/src/components/menu/menu.scss index 19e91d3a1bb..79798a02076 100644 --- a/src/components/menu/menu.scss +++ b/src/components/menu/menu.scss @@ -71,7 +71,6 @@ ion-menu[type=reveal].show-menu { // itself, which is under the menu, does not move. ion-menu[type=overlay] { - left: -8px; // make up for the box-shadow hanging over on the left z-index: $z-index-menu-overlay; ion-backdrop { @@ -88,12 +87,3 @@ ion-menu[type=overlay] { } } } - -ion-menu[type=overlay][side=right] { - left: auto; - right: -8px; -} - -ion-menu[type=push][side=right] { - left: 0; -}