diff --git a/src/scss/components/_anchor-header.scss b/src/scss/components/_anchor-header.scss index 03ef1a07..2ef05256 100644 --- a/src/scss/components/_anchor-header.scss +++ b/src/scss/components/_anchor-header.scss @@ -38,9 +38,10 @@ } .anchor-header__title { - @include type.h0; font-family: variables.$font-family-serif; margin-bottom: variables.$spacing-3; + + @include type.h0; } .anchor-header__link { diff --git a/src/scss/components/_app-header.scss b/src/scss/components/_app-header.scss index ed85be32..c47ff86e 100644 --- a/src/scss/components/_app-header.scss +++ b/src/scss/components/_app-header.scss @@ -12,12 +12,14 @@ $app-header-bp: lg; } .app-header__wrap { - @include grid.make-container; display: flex; + @include grid.make-container; + @media print { display: block; } + } .app-header__wrap--main { diff --git a/src/scss/components/_card-carousel-item.scss b/src/scss/components/_card-carousel-item.scss index 86d1a202..2b4175e2 100644 --- a/src/scss/components/_card-carousel-item.scss +++ b/src/scss/components/_card-carousel-item.scss @@ -157,7 +157,7 @@ $card-carousel-item-colors: ( ); @each $key, $hex in $card-carousel-item-colors { - .card-carousel-item__header--#{$key} { + .card-carousel-item__header--#{"" + $key} { background: rgba($hex, 0.9); } } diff --git a/src/scss/components/_card-carousel.scss b/src/scss/components/_card-carousel.scss index 3665602d..4aa30a5c 100644 --- a/src/scss/components/_card-carousel.scss +++ b/src/scss/components/_card-carousel.scss @@ -25,10 +25,11 @@ $card-carousel-height: 600px; .card-carousel__title { color: variables.$white; - @include type.h0; // line-height: $h1-line-height; margin-bottom: 1rem; + @include type.h0; + @include breakpoints.breakpoint(md) { margin-bottom: 3rem; } diff --git a/src/scss/components/_chart.scss b/src/scss/components/_chart.scss index 5d1dcce0..b64dfee1 100644 --- a/src/scss/components/_chart.scss +++ b/src/scss/components/_chart.scss @@ -17,8 +17,8 @@ } .chart-group__item { - @include grid.make-col-ready; margin-bottom: variables.$spacing-5; + @include grid.make-col-ready; // TODO: clever class names we should change to pass stylelint class pattern // stylelint-disable-next-line diff --git a/src/scss/components/_cta-group.scss b/src/scss/components/_cta-group.scss index f12c9ed2..a661e647 100644 --- a/src/scss/components/_cta-group.scss +++ b/src/scss/components/_cta-group.scss @@ -15,10 +15,10 @@ } .cta-group__item { - @include grid.make-col-ready; padding-top: variables.$spacing-4; padding-bottom: variables.$spacing-4; text-align: center; + @include grid.make-col-ready; @include breakpoints.breakpoint(md) { padding-top: variables.$spacing-5; @@ -69,8 +69,8 @@ } .cta-group__title { - @include type.h2; margin-bottom: variables.$spacing-2; + @include type.h2; } .cta-group__text { diff --git a/src/scss/components/_davis-header.scss b/src/scss/components/_davis-header.scss index bf03e7ff..b001bd20 100644 --- a/src/scss/components/_davis-header.scss +++ b/src/scss/components/_davis-header.scss @@ -51,8 +51,10 @@ } } - padding-top: variables.$spacing-3; - padding-bottom: variables.$spacing-3; + & { + padding-top: variables.$spacing-3; + padding-bottom: variables.$spacing-3; + } @include breakpoints.breakpoint(md) { padding-top: variables.$spacing-4; @@ -99,9 +101,9 @@ } .davis-nav { - @include mixins.print-hide; display: none; + @include mixins.print-hide; @include breakpoints.breakpoint(xl) { display: initial; } diff --git a/src/scss/components/_grid.scss b/src/scss/components/_grid.scss index 9f9a2e44..322f59d2 100644 --- a/src/scss/components/_grid.scss +++ b/src/scss/components/_grid.scss @@ -6,7 +6,7 @@ .container { @include grid.make-container; - + @media print { padding-left: 0; padding-right: 0; diff --git a/src/scss/components/_journey.scss b/src/scss/components/_journey.scss index 6cf0ce6b..d08d3438 100644 --- a/src/scss/components/_journey.scss +++ b/src/scss/components/_journey.scss @@ -491,7 +491,8 @@ h1 { font-size: variables.$typescale-7; - + font-weight: variables.$font-weight-light; + @include breakpoints.breakpoint(lg) { font-size: functions.rem(40); } @@ -499,8 +500,6 @@ @include breakpoints.breakpoint(xl) { font-size: variables.$typescale-9; } - - font-weight: variables.$font-weight-light; } p.sub-title { diff --git a/src/scss/components/_midd-header.scss b/src/scss/components/_midd-header.scss index 9a7fee1d..f54340c6 100644 --- a/src/scss/components/_midd-header.scss +++ b/src/scss/components/_midd-header.scss @@ -25,9 +25,10 @@ } .midd-header__container { - @include grid.make-container; position: relative; display: flex; + + @include grid.make-container; } .midd-header__brand { diff --git a/src/scss/components/_office-footer.scss b/src/scss/components/_office-footer.scss index 7f6185e8..cbc23cb2 100644 --- a/src/scss/components/_office-footer.scss +++ b/src/scss/components/_office-footer.scss @@ -15,24 +15,25 @@ } .office-footer__row { - @include grid.make-row; justify-content: center; + @include grid.make-row; } .office-footer__col { - @include grid.make-col-ready; padding-bottom: variables.$spacing-4; padding-top: variables.$spacing-4; + @include grid.make-col-ready; + @include breakpoints.breakpoint(md) { padding-bottom: variables.$spacing-5; padding-top: variables.$spacing-5; } @include breakpoints.breakpoint(lg) { - @include grid.make-col(4); padding-top: 0; padding-bottom: 0; + @include grid.make-col(4); } &:not(:last-child) { diff --git a/src/scss/components/_page-header.scss b/src/scss/components/_page-header.scss index b2174a38..0193b54d 100644 --- a/src/scss/components/_page-header.scss +++ b/src/scss/components/_page-header.scss @@ -209,9 +209,9 @@ } .page-header__content { - @include grid.make-col-ready; padding-top: variables.$spacing-5; padding-bottom: variables.$spacing-4; + @include grid.make-col-ready; @include breakpoints.breakpoint(md) { padding-top: variables.$spacing-6; diff --git a/src/scss/components/_school-footer.scss b/src/scss/components/_school-footer.scss index 221af44e..0d94f92c 100644 --- a/src/scss/components/_school-footer.scss +++ b/src/scss/components/_school-footer.scss @@ -41,18 +41,18 @@ } .school-footer__secondary { - @include grid.make-col-ready; padding-top: variables.$spacing-5; padding-bottom: variables.$spacing-5; + @include grid.make-col-ready; @include breakpoints.breakpoint(md) { - @include grid.make-col(4); margin-left: auto; + @include grid.make-col(4); } @include breakpoints.breakpoint(lg) { - @include grid.make-col(12); padding-bottom: 0; + @include grid.make-col(12); } .school-footer--lite & { @@ -70,9 +70,9 @@ } .school-footer__text { - @include type.h0; color: variables.$white; margin-bottom: variables.$spacing-4; + @include type.h0; @include breakpoints.breakpoint(md) { margin-bottom: variables.$spacing-5; @@ -80,8 +80,8 @@ } .school-footer__nav { - @include grid.make-col-ready; border-top: 1px solid variables.$navy-light; + @include grid.make-col-ready; @include breakpoints.breakpoint(md) { margin-top: variables.$spacing-5; diff --git a/src/scss/components/_spotlight.scss b/src/scss/components/_spotlight.scss index 22b5ec9b..25c85c6c 100644 --- a/src/scss/components/_spotlight.scss +++ b/src/scss/components/_spotlight.scss @@ -48,11 +48,11 @@ } .spotlight__title { - @include type.h0; background: variables.$color-primary; color: variables.$white; padding-top: variables.$spacing-4; padding-bottom: variables.$spacing-4; + @include type.h0; @include breakpoints.breakpoint(md) { // fake column offset with padding plus gutter width diff --git a/src/scss/components/_tabs.scss b/src/scss/components/_tabs.scss index 63bafbcd..35a292c8 100644 --- a/src/scss/components/_tabs.scss +++ b/src/scss/components/_tabs.scss @@ -16,7 +16,7 @@ .tabs__nav { position: relative; right: 0; - margin: 0 -(variables.$spacing-3); + margin: 0 (-(variables.$spacing-3)); @include breakpoints.breakpoint(md) { margin: 0; diff --git a/src/scss/pardot-forms.scss b/src/scss/pardot-forms.scss index 903d22e4..4112ec06 100644 --- a/src/scss/pardot-forms.scss +++ b/src/scss/pardot-forms.scss @@ -29,8 +29,8 @@ select, textarea, input[type='text'] { - @include forms.form-control; padding: variables.$spacing-2; + @include forms.form-control; } select {