From 92b5422844a81953498d2764940738669ddeaf98 Mon Sep 17 00:00:00 2001 From: David Valdez Date: Wed, 16 Jan 2019 11:48:16 -0600 Subject: [PATCH 1/2] Fixes the navbar when the toolbar is displayed. --- agaric/sass/agaric/_component.navbar.scss | 9 ++++++++- agaric/sass/agaric/_component.tabs.scss | 8 ++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/agaric/sass/agaric/_component.navbar.scss b/agaric/sass/agaric/_component.navbar.scss index f553144..3e9ee4f 100644 --- a/agaric/sass/agaric/_component.navbar.scss +++ b/agaric/sass/agaric/_component.navbar.scss @@ -12,7 +12,7 @@ top: 0; left: 0; right: 0; - z-index: +999; + z-index: +400; // #logo .logo-color { fill: currentColor; @@ -28,6 +28,13 @@ } } +// If the toolbar is present, the is-fixed block must be displayed below the tool bar: +.toolbar-tray-open.toolbar-horizontal { + .is-fixed { + padding-top: 79px; + } +} + // Attempt to keep anchor targets below the fixed header rather than having its // associated content hidden behind the header; hence the height and negative // margin here match the fixed header height at different breakpoints. diff --git a/agaric/sass/agaric/_component.tabs.scss b/agaric/sass/agaric/_component.tabs.scss index c34f9a9..09eafdf 100644 --- a/agaric/sass/agaric/_component.tabs.scss +++ b/agaric/sass/agaric/_component.tabs.scss @@ -34,3 +34,11 @@ top: 5.875em; } } + +.toolbar-tray-open.toolbar-horizontal { + .floating-tabs { + @include desktop { + top: 9.875em; + } + } +} From d9b55e710b8fbbb9b28196806d9e626875bf7da4 Mon Sep 17 00:00:00 2001 From: David Valdez Date: Wed, 16 Jan 2019 11:48:39 -0600 Subject: [PATCH 2/2] Compiled CSS --- agaric/css/agaric.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/agaric/css/agaric.css b/agaric/css/agaric.css index cb6a8c9..b73703b 100644 --- a/agaric/css/agaric.css +++ b/agaric/css/agaric.css @@ -7462,7 +7462,7 @@ ion-icon { top: 0; left: 0; right: 0; - z-index: +999; } + z-index: +400; } .is-fixed #logo .logo-color { fill: currentColor; } .is-fixed + section, @@ -7477,6 +7477,9 @@ ion-icon { .is-fixed + .floating-tabs + #main-content + .node > section:first-child { padding-top: 5.875em; } } +.toolbar-tray-open.toolbar-horizontal .is-fixed { + padding-top: 79px; } + :target::before { content: ""; display: block; @@ -7742,6 +7745,10 @@ a.navbar-link:focus, .floating-tabs { top: 5.875em; } } +@media screen and (min-width: 1024px) { + .toolbar-tray-open.toolbar-horizontal .floating-tabs { + top: 9.875em; } } + a.card { display: block; height: 100%;