fix(toolbar): properly apply safe area and border (#20375)

fixes #20354
ionic-team · Feb 4, 2020 · 4971499 · 4971499
1 parent a25007f
commit 4971499
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/core/src/components/footer/footer.ios.scss b/core/src/components/footer/footer.ios.scss
@@ -4,7 +4,7 @@
 // iOS Footer
 // --------------------------------------------------
 
-.footer-ios ion-toolbar:first-child {
+.footer-ios ion-toolbar:first-of-type {
   --border-width: #{$hairlines-width} 0 0;
 }
 
@@ -21,6 +21,6 @@
   }
 }
 
-.footer-ios.ion-no-border ion-toolbar:first-child {
+.footer-ios.ion-no-border ion-toolbar:first-of-type {
   --border-width: 0;
 }
diff --git a/core/src/components/footer/footer.scss b/core/src/components/footer/footer.scss
@@ -14,6 +14,6 @@ ion-footer {
   z-index: $z-index-toolbar;
 }
 
-ion-footer ion-toolbar:last-child {
+ion-footer ion-toolbar:last-of-type {
   padding-bottom: var(--ion-safe-area-bottom, 0);
 }
diff --git a/core/src/components/header/header.ios.scss b/core/src/components/header/header.ios.scss
@@ -4,7 +4,7 @@
 // iOS Header
 // --------------------------------------------------
 
-.header-ios ion-toolbar:last-child {
+.header-ios ion-toolbar:last-of-type {
   --border-width: 0 0 #{$hairlines-width};
 }
 
@@ -21,7 +21,7 @@
   }
 }
 
-.header-ios.ion-no-border ion-toolbar:last-child {
+.header-ios.ion-no-border ion-toolbar:last-of-type {
   --border-width: 0;
 }
 
@@ -36,7 +36,7 @@
   top: 0;
 }
 
-.header-collapse-condense ion-toolbar:first-child {
+.header-collapse-condense ion-toolbar:first-of-type {
   padding-top: 7px;
 
   z-index: 1;

diff --git a/core/src/components/header/header.scss b/core/src/components/header/header.scss
@@ -14,6 +14,6 @@ ion-header {
   z-index: $z-index-toolbar;
 }
 
-ion-header ion-toolbar:first-child {
+ion-header ion-toolbar:first-of-type {
   padding-top: var(--ion-safe-area-top, 0);
 }