diff --git a/ionic/components/app/structure.scss b/ionic/components/app/structure.scss index ce1362fb29..e6b1336b15 100644 --- a/ionic/components/app/structure.scss +++ b/ionic/components/app/structure.scss @@ -59,6 +59,8 @@ ion-navbar { &.show-navbar { display: flex; } + + transform: translateZ(0); } ion-view, @@ -77,6 +79,8 @@ ion-view, &.show-view { display: flex; } + + transform: translateZ(0); } ion-toolbar { diff --git a/ionic/components/nav-bar/nav-bar.scss b/ionic/components/nav-bar/nav-bar.scss index acecad5bd2..eb09323910 100644 --- a/ionic/components/nav-bar/nav-bar.scss +++ b/ionic/components/nav-bar/nav-bar.scss @@ -51,6 +51,8 @@ ion-title { // used to notify JS when the title has been rendered animation-duration: 1ms; animation-name: nodeInserted; + + transform: translateZ(0); } .navbar-inner-title { @@ -68,3 +70,7 @@ ion-title { .navbar-title-hide { opacity: 0; } + +.back-button { + transform: translateZ(0); +} diff --git a/ionic/components/nav/test/basic/index.js b/ionic/components/nav/test/basic/index.js index a6d074d726..c94aea79d5 100644 --- a/ionic/components/nav/test/basic/index.js +++ b/ionic/components/nav/test/basic/index.js @@ -8,7 +8,9 @@ import {FirstPage} from './pages/first-page'; @Component({ selector: 'ion-app' }) @View({ - templateUrl: 'main.html', + template: ` + + `, directives: [Nav] }) class IonicApp { diff --git a/ionic/components/nav/test/basic/main.html b/ionic/components/nav/test/basic/main.html deleted file mode 100644 index 162fbd5049..0000000000 --- a/ionic/components/nav/test/basic/main.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/ionic/components/nav/test/basic/pages/first-page.html b/ionic/components/nav/test/basic/pages/first-page.html deleted file mode 100644 index 8e7b0468d1..0000000000 --- a/ionic/components/nav/test/basic/pages/first-page.html +++ /dev/null @@ -1,19 +0,0 @@ - -First Page Header: {{ val }} - - - - - -

First Page: {{ val }}

- -

- -

- - - - -
diff --git a/ionic/components/nav/test/basic/pages/first-page.js b/ionic/components/nav/test/basic/pages/first-page.js index b11311121a..88fbec0e31 100644 --- a/ionic/components/nav/test/basic/pages/first-page.js +++ b/ionic/components/nav/test/basic/pages/first-page.js @@ -7,7 +7,22 @@ import {SecondPage} from './second-page'; @Component({selector: 'ion-view'}) @View({ - templateUrl: 'pages/first-page.html', + template: ` + First Page Header: {{ val }} + + + +

First Page: {{ val }}

+ +

+ +

+ + + + +
+ `, directives: [NavbarTemplate, Navbar, Content] }) export class FirstPage { diff --git a/ionic/components/nav/test/basic/pages/second-page.html b/ionic/components/nav/test/basic/pages/second-page.html deleted file mode 100644 index 21c53cb059..0000000000 --- a/ionic/components/nav/test/basic/pages/second-page.html +++ /dev/null @@ -1,34 +0,0 @@ - -Second Page Header - - - - - -

- -

- -

- -

- - - - -
- - diff --git a/ionic/components/nav/test/basic/pages/second-page.js b/ionic/components/nav/test/basic/pages/second-page.js index 22de60bda8..c56c30f14f 100644 --- a/ionic/components/nav/test/basic/pages/second-page.js +++ b/ionic/components/nav/test/basic/pages/second-page.js @@ -7,7 +7,24 @@ import {ThirdPage} from './third-page'; @Component({selector: 'ion-view'}) @View({ - templateUrl: 'pages/second-page.html', + template: ` + Second Page Header + + + +

+ +

+ +

+ +

+ + + + +
+ `, directives: [NavbarTemplate, Navbar, Content] }) export class SecondPage { diff --git a/ionic/components/nav/test/basic/pages/third-page.html b/ionic/components/nav/test/basic/pages/third-page.html deleted file mode 100644 index 99ac3a08a9..0000000000 --- a/ionic/components/nav/test/basic/pages/third-page.html +++ /dev/null @@ -1,17 +0,0 @@ - -Third Page Header - - - - - -

- -

- - - - -
diff --git a/ionic/components/nav/test/basic/pages/third-page.js b/ionic/components/nav/test/basic/pages/third-page.js index 26c1e2f830..19a15f911b 100644 --- a/ionic/components/nav/test/basic/pages/third-page.js +++ b/ionic/components/nav/test/basic/pages/third-page.js @@ -6,7 +6,20 @@ import {NavController, NavbarTemplate, Navbar, Content} from 'ionic/ionic'; @Component({selector: 'ion-view'}) @View({ - templateUrl: 'pages/third-page.html', + template: ` + Third Page Header + + + +

+ +

+ + + + +
+ `, directives: [NavbarTemplate, Navbar, Content] }) export class ThirdPage { diff --git a/scripts/e2e/angular.template.html b/scripts/e2e/angular.template.html index 54c7d3ab47..84c768eb71 100644 --- a/scripts/e2e/angular.template.html +++ b/scripts/e2e/angular.template.html @@ -2,8 +2,24 @@ - + + + + +