diff --git a/ionic/components/app/structure.scss b/ionic/components/app/structure.scss index f17ca779f8..9467f3c9c1 100644 --- a/ionic/components/app/structure.scss +++ b/ionic/components/app/structure.scss @@ -9,6 +9,7 @@ $z-index-menu-backdrop: 79; $z-index-overlay: 1000; $z-index-click-block: 9999; +$z-index-fixed-content: 2; $z-index-scroll-content: 1; $z-index-refresher: 0; @@ -20,7 +21,7 @@ $z-index-toolbar-background: -1; $z-index-toolbar-border: 20; $z-index-list-border: 50; -$z-index-backdrop: 1; +$z-index-backdrop: 2; $z-index-overlay-wrapper: 10; $z-index-item-options: 1; diff --git a/ionic/components/content/content.scss b/ionic/components/content/content.scss index 146cec1e31..c57c4f22dc 100644 --- a/ionic/components/content/content.scss +++ b/ionic/components/content/content.scss @@ -18,3 +18,12 @@ [no-margin] { margin: 0; } + +// Content Fixed +// -------------------------------------------------- + +ion-fixed { + position: absolute; + transform: translateZ(0); + z-index: $z-index-fixed-content; +} diff --git a/ionic/components/content/content.ts b/ionic/components/content/content.ts index 026ae8dbd2..f6068b51d5 100644 --- a/ionic/components/content/content.ts +++ b/ionic/components/content/content.ts @@ -31,6 +31,7 @@ import {ScrollTo} from '../../animations/scroll-to'; '' + '' + '' + + '' + '' }) export class Content extends Ion { diff --git a/ionic/components/nav/test/basic/index.ts b/ionic/components/nav/test/basic/index.ts index 99f5a488a2..8300ac02bf 100644 --- a/ionic/components/nav/test/basic/index.ts +++ b/ionic/components/nav/test/basic/index.ts @@ -207,6 +207,10 @@ class FullPage {

+ + + + ` }) @@ -240,6 +244,12 @@ class PrimaryHeaderPage { this.nav.setRoot(AnotherPage); } + presentAlert() { + let alert = Alert.create(); + alert.setTitle('Hello Alert'); + alert.addButton({ text: 'Dismiss', role: 'cancel', }); + this.nav.present(alert); + } } diff --git a/ionic/transitions/transition-ios.ts b/ionic/transitions/transition-ios.ts index d98b4838ac..431898a793 100644 --- a/ionic/transitions/transition-ios.ts +++ b/ionic/transitions/transition-ios.ts @@ -171,7 +171,7 @@ class IOSTransition extends Transition { // should just slide out, no fading out leavingNavbarBg .before.clearStyles([OPACITY]) - .fromTo(TRANSLATEX, CENTER, '100%'); + .fromTo(TRANSLATEX, CENTER, '100%'); } let leavingBackBtnText = new Animation(leavingView.backBtnTextRef());