Merge pull request #1053 from dod-ccpo/fix-sidebar

Stickybits!
This commit is contained in:
leigh-mil
2019-08-30 18:15:57 -04:00
committed by GitHub
12 changed files with 88 additions and 48 deletions

View File

@@ -19,15 +19,18 @@ body {
display: flex;
flex-wrap: nowrap;
flex-grow: 1;
margin-bottom: $footer-height;
padding-bottom: $footer-height * 2.5;
.global-panel-container {
margin: $gap;
flex-grow: 1;
-ms-flex-negative: 1;
top: $usa-banner-height + $topbar-height;
position: relative;
@include media($medium-screen) {
margin: $gap * 2;
top: $usa-banner-height + $topbar-height;
}
}
}

View File

@@ -1,5 +1,6 @@
.global-navigation {
background-color: $color-white;
height: auto;
.sidenav__link {
padding-right: $gap * 2;

View File

@@ -1,14 +1,16 @@
.sticky-cta {
margin-left: -$gap * 4;
margin-right: -$gap * 5;
z-index: 10;
@include media($medium-screen) {
margin-left: -$gap * 5;
margin-right: -$gap * 3;
margin-right: -$gap * 5;
}
&.js-is-sticky {
width: 80.8%;
width: calc(100% - 25rem);
top: $usa-banner-height + $topbar-height;
}
.sticky-cta-container {
@@ -18,7 +20,7 @@
background-color: $color-gray-lightest;
border-top: 1px solid $color-gray-lighter;
border-bottom: 1px solid $color-gray-lighter;
padding: 0 $gap * 2 0 $gap * 5;
padding: 0 $gap * 5 0 $gap * 5;
box-shadow: $box-shadow;
.usa-button {

View File

@@ -1,6 +1,11 @@
.topbar {
background-color: $color-blue-darkest;
border-bottom: 1px solid $color-black;
height: $topbar-height;
position: fixed;
top: $usa-banner-height;
width: 100%;
z-index: 10;
&__navigation {
display: flex;

View File

@@ -3,6 +3,9 @@
align-items: center;
padding: ($gap / 2) $gap;
z-index: 15;
position: fixed;
height: $usa-banner-height;
width: 100%;
img {
flex-grow: 0;

View File

@@ -13,6 +13,9 @@ $hover-transition-time: 0.2s;
$search-input-height: 4.4rem;
$search-button-width: 5rem;
$footer-height: 5rem;
$usa-banner-height: 2.8rem;
$sidenav-expanded-width: 25rem;
$sidenav-collapsed-width: 10rem;
/*
* USWDS Variables

View File

@@ -4,20 +4,28 @@
}
.sidenav-container {
position: relative;
box-shadow: $box-shadow;
overflow: hidden;
position: relative;
top: $topbar-height + $usa-banner-height;
width: $sidenav-expanded-width;
.global-navigation.sidenav {
height: 100%;
&--minimized {
@extend .sidenav-container;
width: $sidenav-collapsed-width;
}
&__fixed {
position: fixed;
}
.sidenav {
width: $sidenav-expanded-width;
@include media($large-screen) {
margin: 0px;
}
width: 25rem;
&__title {
@include sidenav__header;
@@ -43,7 +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: 0;
left: 0;
width: $sidenav-expanded-width;
background-color: $color-white;
}
list-style: none;
@@ -182,7 +199,7 @@
&--minimized {
@extend .sidenav;
width: 10rem;
width: $sidenav-collapsed-width;
margin: 0px;
}
}