From 4ba1c4d86977d00c3b1280efffa03176813ad1ac Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Fri, 30 Aug 2019 15:19:44 -0400 Subject: [PATCH] Fix styling issues -- make side nav extend to top of footer, and expand padding on global layout so items are not cut off --- styles/components/_global_layout.scss | 2 +- styles/components/_global_navigation.scss | 1 + styles/elements/_sidenav.scss | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/styles/components/_global_layout.scss b/styles/components/_global_layout.scss index 8fbda16e..5ad748d1 100644 --- a/styles/components/_global_layout.scss +++ b/styles/components/_global_layout.scss @@ -19,7 +19,7 @@ body { display: flex; flex-wrap: nowrap; flex-grow: 1; - margin-bottom: $footer-height; + padding-bottom: $footer-height * 2.5; .global-panel-container { margin: $gap; diff --git a/styles/components/_global_navigation.scss b/styles/components/_global_navigation.scss index 809e25cd..75daa768 100644 --- a/styles/components/_global_navigation.scss +++ b/styles/components/_global_navigation.scss @@ -1,5 +1,6 @@ .global-navigation { background-color: $color-white; + height: auto; .sidenav__link { padding-right: $gap * 2; diff --git a/styles/elements/_sidenav.scss b/styles/elements/_sidenav.scss index 4df6c196..0a6b201c 100644 --- a/styles/elements/_sidenav.scss +++ b/styles/elements/_sidenav.scss @@ -51,13 +51,16 @@ ul { &.sidenav__list--padded { - margin: ( 4 * $gap) 0; + margin-top: 4 * $gap; + margin-bottom: $footer-height; + padding-bottom: $gap; position: fixed; overflow-y: scroll; top: $topbar-height + $usa-banner-height + 4rem; - bottom: $footer-height; + bottom: 0; left: 0; width: $sidenav-expanded-width; + background-color: $color-white; } list-style: none;