From 422c98373b5d2605d965720c98bd7c52a92d02d1 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Fri, 15 Apr 2016 12:12:43 -0400 Subject: [PATCH] fix(cordova): only target navbar section when it has the statusbar-padding --- ionic/platform/cordova.ios.scss | 8 ++++---- ionic/platform/cordova.md.scss | 4 ++-- ionic/platform/cordova.wp.scss | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ionic/platform/cordova.ios.scss b/ionic/platform/cordova.ios.scss index 20755a3186..48cc3d3581 100644 --- a/ionic/platform/cordova.ios.scss +++ b/ionic/platform/cordova.ios.scss @@ -6,14 +6,14 @@ $cordova-ios-statusbar-padding: 20px !default; -ion-navbar-section { +ion-navbar-section.statusbar-padding { height: calc(#{$toolbar-ios-height} + #{$cordova-ios-statusbar-padding}); min-height: calc(#{$toolbar-ios-height} + #{$cordova-ios-statusbar-padding}); } -ion-navbar-section > .toolbar ion-segment, -ion-navbar-section > .toolbar ion-title, -ion-navbar-section > .toolbar { +ion-navbar-section.statusbar-padding > .toolbar ion-segment, +ion-navbar-section.statusbar-padding > .toolbar ion-title, +ion-navbar-section.statusbar-padding > .toolbar { padding-top: $cordova-ios-statusbar-padding; height: calc(#{$toolbar-ios-height} + #{$cordova-ios-statusbar-padding}); min-height: calc(#{$toolbar-ios-height} + #{$cordova-ios-statusbar-padding}); diff --git a/ionic/platform/cordova.md.scss b/ionic/platform/cordova.md.scss index c4bcfd0452..0d933bf8f0 100644 --- a/ionic/platform/cordova.md.scss +++ b/ionic/platform/cordova.md.scss @@ -6,12 +6,12 @@ $cordova-ios-statusbar-padding: 20px !default; -ion-navbar-section { +ion-navbar-section.statusbar-padding { height: calc(#{$toolbar-md-height} + #{$cordova-ios-statusbar-padding}); min-height: calc(#{$toolbar-md-height} + #{$cordova-ios-statusbar-padding}); } -ion-navbar-section > .toolbar { +ion-navbar-section.statusbar-padding > .toolbar { padding-top: $cordova-ios-statusbar-padding; height: calc(#{$toolbar-md-height} + #{$cordova-ios-statusbar-padding}); min-height: calc(#{$toolbar-md-height} + #{$cordova-ios-statusbar-padding}); diff --git a/ionic/platform/cordova.wp.scss b/ionic/platform/cordova.wp.scss index 0e60eb45c6..fb49234062 100644 --- a/ionic/platform/cordova.wp.scss +++ b/ionic/platform/cordova.wp.scss @@ -6,12 +6,12 @@ $cordova-ios-statusbar-padding: 20px !default; -ion-navbar-section { +ion-navbar-section.statusbar-padding { height: calc(#{$toolbar-wp-height} + #{$cordova-ios-statusbar-padding}); min-height: calc(#{$toolbar-wp-height} + #{$cordova-ios-statusbar-padding}); } -ion-navbar-section > .toolbar { +ion-navbar-section.statusbar-padding > .toolbar { padding-top: $cordova-ios-statusbar-padding; height: calc(#{$toolbar-wp-height} + #{$cordova-ios-statusbar-padding}); min-height: calc(#{$toolbar-wp-height} + #{$cordova-ios-statusbar-padding});