From 3941e1c392fda4c12e178c5f8fd03724c30a28c2 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Tue, 10 Mar 2020 11:17:40 -0400 Subject: [PATCH 1/3] collapsable toolbar should have same bg as content --- core/src/components/header/header.ios.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/src/components/header/header.ios.scss b/core/src/components/header/header.ios.scss index e401c1bef91..edc68496854 100644 --- a/core/src/components/header/header.ios.scss +++ b/core/src/components/header/header.ios.scss @@ -50,7 +50,12 @@ z-index: 1; } +/** + * Large title toolbar should just use the content background since it needs + * to blend in with the header above it. + */ .header-collapse-condense ion-toolbar { + --background: var(--ion-background-color, #fff); z-index: 0; } From 175202d7159cce325334e9790dd4d10774ebb679 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Tue, 10 Mar 2020 11:21:08 -0400 Subject: [PATCH 2/3] rearrange comment --- core/src/components/header/header.ios.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/components/header/header.ios.scss b/core/src/components/header/header.ios.scss index edc68496854..0fa803b5148 100644 --- a/core/src/components/header/header.ios.scss +++ b/core/src/components/header/header.ios.scss @@ -51,8 +51,8 @@ } /** - * Large title toolbar should just use the content background since it needs - * to blend in with the header above it. + * Large title toolbar should just use the content background + * since it needs to blend in with the header above it. */ .header-collapse-condense ion-toolbar { --background: var(--ion-background-color, #fff); From 0f5b4d11a60621cbb3fcf63eed3b1cd39b3bc074 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Tue, 10 Mar 2020 11:39:34 -0400 Subject: [PATCH 3/3] Update core/src/components/header/header.ios.scss Co-Authored-By: Brandy Carney --- core/src/components/header/header.ios.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/components/header/header.ios.scss b/core/src/components/header/header.ios.scss index 0fa803b5148..d722f67c747 100644 --- a/core/src/components/header/header.ios.scss +++ b/core/src/components/header/header.ios.scss @@ -56,6 +56,7 @@ */ .header-collapse-condense ion-toolbar { --background: var(--ion-background-color, #fff); + z-index: 0; } @@ -86,4 +87,4 @@ .header-collapse-condense-inactive.header-collapse-condense ion-toolbar.in-toolbar ion-title, .header-collapse-condense-inactive.header-collapse-condense ion-toolbar.in-toolbar ion-buttons.buttons-collapse { visibility: hidden; -} \ No newline at end of file +}