fix(menu): push/overlay working correctly in landscape

ionic-team · Jun 16, 2016 · 0c88589 · 0c88589
1 parent 87812f3
commit 0c88589
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git 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
@@ -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;
-}