From 62b97ce4f36448796c3769702364aa5c5cf0f3ba Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Mon, 2 May 2016 13:08:17 -0400
Subject: [PATCH] fix(app): add status bar padding to navbar when a tab subpage

closes #6368
---
 ionic/components/app/test/cordova/index.ts   | 5 ++++-
 ionic/components/app/test/cordova/page2.html | 1 +
 ionic/platform/cordova.ios.scss              | 1 +
 ionic/platform/cordova.md.scss               | 1 +
 ionic/platform/cordova.wp.scss               | 1 +
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ionic/components/app/test/cordova/index.ts b/ionic/components/app/test/cordova/index.ts
index 6cbf5493f6d..2dfca0b6cc0 100644
--- a/ionic/components/app/test/cordova/index.ts
+++ b/ionic/components/app/test/cordova/index.ts
@@ -50,6 +50,7 @@ class Page1 {
   templateUrl: 'page2.html'
 })
 class Page2 {
+  page1 = Page1;
   page3 = Page3;
 
   constructor(private nav: NavController) {
@@ -122,7 +123,9 @@ class TabsPage {
 
 @App({
   templateUrl: `./app.html`,
-  config: { statusbarPadding: true }
+  config: {
+    statusbarPadding: true
+  }
 })
 class E2EApp {
   root = Page1;
diff --git a/ionic/components/app/test/cordova/page2.html b/ionic/components/app/test/cordova/page2.html
index 6a6b3502885..5c8564c67c0 100644
--- a/ionic/components/app/test/cordova/page2.html
+++ b/ionic/components/app/test/cordova/page2.html
@@ -19,6 +19,7 @@
 <ion-content padding>
   <div padding-bottom>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi scelerisque dolor lacus, ut vehicula arcu dapibus id. Morbi iaculis fermentum blandit. Curabitur tempus, ante et vehicula tempor, urna velit rutrum massa, quis suscipit purus lacus eget est. Sed nisi nulla, tempus id dictum a, cursus ut felis. Aliquam orci magna, rutrum nec tempor ac, fermentum quis eros. Sed ullamcorper felis sit amet tristique sagittis. Nullam sed tempus mi. Morbi sit amet lacinia leo. Nunc facilisis orci id consectetur dignissim. Integer dictum consectetur enim. Vivamus auctor, turpis ut eleifend pharetra, purus magna mattis arcu, vel pharetra tellus orci eget ex. Integer blandit posuere vehicula. Ut ipsum lorem, efficitur vitae eleifend tincidunt, fermentum nec lacus. Ut nec fermentum dui.</div>
 
+  <button block [navPush]="page1">Go to Page 1</button>
   <button block [navPush]="page3">Go to Page 3</button>
   <button block secondary (click)="openModal()" class="e2eCordovaOpenModal">Open Modal</button>
 </ion-content>
diff --git a/ionic/platform/cordova.ios.scss b/ionic/platform/cordova.ios.scss
index 15a73bbb187..f8752c5ae60 100644
--- a/ionic/platform/cordova.ios.scss
+++ b/ionic/platform/cordova.ios.scss
@@ -20,6 +20,7 @@ ion-navbar-section.statusbar-padding > .toolbar {
   min-height: calc(#{$toolbar-ios-height} + #{$cordova-ios-statusbar-padding});
 }
 
+.tab-subpage,
 ion-nav > ion-page,
 ion-menu {
   > .toolbar.statusbar-padding:first-child ion-segment,
diff --git a/ionic/platform/cordova.md.scss b/ionic/platform/cordova.md.scss
index a65e78c5aae..1a35c58beb8 100644
--- a/ionic/platform/cordova.md.scss
+++ b/ionic/platform/cordova.md.scss
@@ -18,6 +18,7 @@ ion-navbar-section.statusbar-padding > .toolbar {
   min-height: calc(#{$toolbar-md-height} + #{$cordova-ios-statusbar-padding});
 }
 
+.tab-subpage,
 ion-nav > ion-page,
 ion-menu {
   > .toolbar.statusbar-padding:first-child {
diff --git a/ionic/platform/cordova.wp.scss b/ionic/platform/cordova.wp.scss
index b0dea41f90e..202f5bdf60b 100644
--- a/ionic/platform/cordova.wp.scss
+++ b/ionic/platform/cordova.wp.scss
@@ -18,6 +18,7 @@ ion-navbar-section.statusbar-padding > .toolbar {
   min-height: calc(#{$toolbar-wp-height} + #{$cordova-ios-statusbar-padding});
 }
 
+.tab-subpage,
 ion-nav > ion-page,
 ion-menu {
   > .toolbar.statusbar-padding:first-child {