diff --git a/CHANGELOG.md b/CHANGELOG.md index d11a101ffb..67f863515e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ # Mayflower Release Notes All notable changes to this project will be documented in this file. +## 9.55.0 (8/24/2020) +### Changed +- (React) [MainNav] DP-19425: Fix formatting of COVID global nav link on search.mass.gov (#1143) + +### Fixed +- (React, Assets) [FooterSlim] Fix markup semantic and classnames. (#1148) + ## 9.54.0 (8/10/2020) ### Added - (Assets) [Font] DP-19538: Consolidate font sizes into a variable scale. (#1055) diff --git a/assets/scss/00-base/mixins/_ma-typography.scss b/assets/scss/00-base/mixins/_ma-typography.scss index 21393370d9..31d19c7398 100644 --- a/assets/scss/00-base/mixins/_ma-typography.scss +++ b/assets/scss/00-base/mixins/_ma-typography.scss @@ -53,6 +53,7 @@ } @mixin ma-heading($level: 1) { + font-weight: $fonts-bold; @if ($level == 1) { diff --git a/assets/scss/01-atoms/global/_elements.scss b/assets/scss/01-atoms/global/_elements.scss index a99a435c83..dd47c014f9 100644 --- a/assets/scss/01-atoms/global/_elements.scss +++ b/assets/scss/01-atoms/global/_elements.scss @@ -132,7 +132,6 @@ ol { h#{$i} { margin-top: 0; color: $c-font-heading; - font-weight: $fonts-bold; @include ma-heading($i); } diff --git a/assets/scss/03-organisms/_footer-slim.scss b/assets/scss/03-organisms/_footer-slim.scss index 7511ded301..1246f0814f 100644 --- a/assets/scss/03-organisms/_footer-slim.scss +++ b/assets/scss/03-organisms/_footer-slim.scss @@ -1,4 +1,4 @@ -.ma__footer_slim { +.ma__footer-slim { background-color: $c-platinum-gray; font-size: $fonts-small; line-height: 1.2; @@ -10,35 +10,20 @@ @include ma-container; } - &--container { + &__container { position: relative; - &-inner { + &__inner { display: flex; flex-direction: column; padding-top: 0.5rem; - h3 { - margin-top: 0.5rem; - margin-left: 3.25rem; - } - @media ($bp-large-min) { flex-direction: row; align-items: flex-start; justify-content: space-between; margin: 0; padding: 0.75rem 0 0 3.5rem; - - section { - margin-right: 2rem; - margin-bottom: 0.25rem; - } - - h3 { - margin-top: inherit; - margin-left: auto; - } } } } @@ -52,15 +37,30 @@ } } - &--info { + &__info { max-width: 500px; - h3 { - font-size: $fonts-small; + @media ($bp-large-min) { + margin-right: 2rem; + margin-bottom: 0.25rem; + } + } + + &__title { + + @include ma-heading(3); + font-size: $fonts-small; + + margin-top: 0.5rem; + margin-left: 3.25rem; + + @media ($bp-large-min) { + margin-top: inherit; + margin-left: auto; } } - &--details { + &__details { margin-top: 2rem; @media ($bp-large-min) { @@ -69,7 +69,7 @@ } } - &--links { + &__links { margin-bottom: 1em; a { @@ -89,7 +89,7 @@ } } - &--contact { + &__contact { a { font-weight: $fonts-normal; diff --git a/react/backstop/data/bitmaps_reference/vrt_organisms_FooterSlim_0_rootdiv_0_phone.png b/react/backstop/data/bitmaps_reference/vrt_organisms_FooterSlim_0_rootdiv_0_phone.png index d1711c3509..71426ac33a 100644 Binary files a/react/backstop/data/bitmaps_reference/vrt_organisms_FooterSlim_0_rootdiv_0_phone.png and b/react/backstop/data/bitmaps_reference/vrt_organisms_FooterSlim_0_rootdiv_0_phone.png differ diff --git a/react/backstop/data/bitmaps_reference/vrt_organisms_FooterSlim_0_rootdiv_1_tablet.png b/react/backstop/data/bitmaps_reference/vrt_organisms_FooterSlim_0_rootdiv_1_tablet.png index ce3acbf142..2ca05f6c6e 100644 Binary files a/react/backstop/data/bitmaps_reference/vrt_organisms_FooterSlim_0_rootdiv_1_tablet.png and b/react/backstop/data/bitmaps_reference/vrt_organisms_FooterSlim_0_rootdiv_1_tablet.png differ diff --git a/react/src/components/molecules/MainNav/index.js b/react/src/components/molecules/MainNav/index.js index 637f6a312c..e5b85dd22a 100644 --- a/react/src/components/molecules/MainNav/index.js +++ b/react/src/components/molecules/MainNav/index.js @@ -110,16 +110,29 @@ class MainNav extends Component {
)); - } else { - const buttonProps = { - id: buttonId, - className: 'ma__main-nav__top-link', - 'aria-haspopup': 'true', - key: buttonId, - role: 'menuitem', - 'aria-label': (isExpanded) ? `Hide submenu for ${item.text}` : `Show submenu for ${item.text}` - }; - itemBody.push(); - } + } else { + const buttonProps = { + id: buttonId, + className: 'ma__main-nav__top-link', + 'aria-haspopup': 'true', + key: buttonId, + role: 'menuitem', + 'aria-label': (isExpanded) ? `Hide submenu for ${item.text}` : `Show submenu for ${item.text}` + }; + itemBody.push(); + } return( /* eslint-disable-next-line jsx-a11y/mouse-events-have-key-events */
  • ( -