javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-23 05:58:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2016-06-16 12:40:21 +02:00
parent 87812f362a
commit 0c885899bc
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/menu/menu-types.ts
View File

@ -98,9 +98,10 @@ class MenuPushType extends MenuType {
let contentOpenedX: string, menuClosedX: string, menuOpenedX: string; let contentOpenedX: string, menuClosedX: string, menuOpenedX: string;
if (menu.side === 'right') { if (menu.side === 'right') {
// right side
contentOpenedX = -menu.width() + 'px'; contentOpenedX = -menu.width() + 'px';
menuOpenedX = (platform.width() - menu.width()) + 'px'; menuClosedX = menu.width() + 'px';
menuClosedX = platform.width() + 'px'; menuOpenedX = '0px';
} else { } else {
contentOpenedX = menu.width() + 'px'; contentOpenedX = menu.width() + 'px';
@ -137,13 +138,13 @@ class MenuOverlayType extends MenuType {
let closedX: string, openedX: string; let closedX: string, openedX: string;
if (menu.side === 'right') { if (menu.side === 'right') {
// right side // right side
closedX = menu.width() + 'px'; closedX = 8 + menu.width() + 'px';
openedX = '0px'; openedX = '0px';
} else { } else {
// left side // left side
closedX = -menu.width() + 'px'; closedX = -(8 + menu.width()) + 'px';
openedX = '8px'; openedX = '0px';
} }
let menuAni = new Animation(menu.getMenuElement()); let menuAni = new Animation(menu.getMenuElement());

10
src/components/menu/menu.scss
View File

@ -71,7 +71,6 @@ ion-menu[type=reveal].show-menu {
// itself, which is under the menu, does not move. // itself, which is under the menu, does not move.
ion-menu[type=overlay] { ion-menu[type=overlay] {
left: -8px; // make up for the box-shadow hanging over on the left
z-index: $z-index-menu-overlay; z-index: $z-index-menu-overlay;
ion-backdrop { 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;
}