From d2c3cb7308b008649a71accdf52040f22cc70e4a Mon Sep 17 00:00:00 2001 From: Evgeniy Date: Thu, 30 Jan 2020 16:50:20 +0200 Subject: [PATCH] fix env(safe-area-inset-top) = 0 in chrome --- src/platform/cordova.scss | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/src/platform/cordova.scss b/src/platform/cordova.scss index 2b3e2b5a5..3a038c15f 100644 --- a/src/platform/cordova.scss +++ b/src/platform/cordova.scss @@ -47,24 +47,32 @@ $cordova-statusbar-padding-modal-max-width: 767px !default; > .toolbar.statusbar-padding:first-child { @include padding(calc(#{$cordova-statusbar-padding} + #{$toolbar-padding}), null, null, null); @include padding(calc(constant(safe-area-inset-top) + #{$toolbar-padding}), null, null, null); - @include padding(calc(env(safe-area-inset-top) + #{$toolbar-padding}), null, null, null); + @supports (padding-top: env(safe-area-inset-top)) { + @include padding(calc(max(env(safe-area-inset-top), #{$cordova-statusbar-padding}) + #{$toolbar-padding}), null, null, null); + } min-height: calc(#{$toolbar-height} + #{$cordova-statusbar-padding}); min-height: calc(#{$toolbar-height} + constant(safe-area-inset-top)); - min-height: calc(#{$toolbar-height} + env(safe-area-inset-top)); + @supports (min-height: env(safe-area-inset-top)) { + min-height: calc(#{$toolbar-height} + max(env(safe-area-inset-top), #{$cordova-statusbar-padding})); + } } > ion-content.statusbar-padding:first-child .scroll-content { @include padding($cordova-statusbar-padding, null, null, null); @include padding(constant(safe-area-inset-top), null, null, null); - @include padding(env(safe-area-inset-top), null, null, null); + @supports (padding-top: env(safe-area-inset-top)) { + @include padding(calc(max(env(safe-area-inset-top), #{$cordova-statusbar-padding})), null, null, null); + } } > ion-content.statusbar-padding:first-child[padding] .scroll-content, > ion-content.statusbar-padding:first-child[padding-top] .scroll-content { @include padding(calc(#{$content-padding} + #{$cordova-statusbar-padding}), null, null, null); @include padding(constant(safe-area-inset-top), null, null, null); - @include padding(env(safe-area-inset-top), null, null, null); + @supports (padding-top: env(safe-area-inset-top)) { + @include padding(calc(max(env(safe-area-inset-top), #{$cordova-statusbar-padding})), null, null, null); + } } } @@ -79,15 +87,21 @@ $cordova-statusbar-padding-modal-max-width: 767px !default; > .toolbar.statusbar-padding:first-child ion-title { @include padding($cordova-statusbar-padding, null, null, null); @include padding(constant(safe-area-inset-top), null, null, null); - @include padding(env(safe-area-inset-top), null, null, null); + @supports (padding-top: env(safe-area-inset-top)) { + @include padding(calc(max(env(safe-area-inset-top), #{$cordova-statusbar-padding})), null, null, null); + } height: calc(#{$toolbar-height} + #{$cordova-statusbar-padding}); height: calc(#{$toolbar-height} + constant(safe-area-inset-top)); - height: calc(#{$toolbar-height} + env(safe-area-inset-top)); + @supports (height: env(safe-area-inset-top)) { + height: calc(#{$toolbar-height} + max(env(safe-area-inset-top), #{$cordova-statusbar-padding})); + } min-height: calc(#{$toolbar-height} + #{$cordova-statusbar-padding}); min-height: calc(#{$toolbar-height} + constant(safe-area-inset-top)); - min-height: calc(#{$toolbar-height} + env(safe-area-inset-top)); + @supports (min-height: env(safe-area-inset-top)) { + min-height: calc(#{$toolbar-height} + max(env(safe-area-inset-top), #{$cordova-statusbar-padding})); + } } }