diff --git a/assets/styles/theme/_uswds-theme-color.scss b/assets/styles/theme/_uswds-theme-color.scss index dc00a61e7b..5104c55b65 100644 --- a/assets/styles/theme/_uswds-theme-color.scss +++ b/assets/styles/theme/_uswds-theme-color.scss @@ -139,9 +139,9 @@ $theme-text-reverse-color: "white"; // Links $theme-link-color: "primary"; -$theme-link-visited-color: "violet-70v"; +$theme-link-visited-color: "violet-60v"; $theme-link-hover-color: "primary-darker"; -$theme-link-active-color: "primary-darker"; +$theme-link-active-color: "blue-warm-70v"; $theme-link-reverse-color: "base-lighter"; $theme-link-reverse-hover-color: "base-lightest"; -$theme-link-reverse-active-color: "white"; +$theme-link-reverse-active-color: "white"; \ No newline at end of file diff --git a/assets/styles/theme/_uswds-theme-usagov.scss b/assets/styles/theme/_uswds-theme-usagov.scss index 0af1305632..1596b411f9 100644 --- a/assets/styles/theme/_uswds-theme-usagov.scss +++ b/assets/styles/theme/_uswds-theme-usagov.scss @@ -105,6 +105,7 @@ $AZ-button-disabled: #859cba; } .usa-footer { + // more specified styles to align with parent web property usa.gov &__primary-section { @include u-bg("gray-cool-10"); } @@ -118,25 +119,69 @@ $AZ-button-disabled: #859cba; text-decoration: none; } - .usa-list--unstyled > li { - @include u-margin-bottom(1); + &__contact-links { + margin-top: 0; } - &__primary-content { - @include at-media(mobile-lg) { - @include u-border-top(1px, "solid", "base-light"); - } + &__contact-heading { + margin-bottom: .5rem; + } - @include at-media(tablet) { - border: 0; + #bottom-phone { + p, + a { + font-size: 17.6px; } } } -.usa-footer--big .usa-footer__primary-content--collapsible .usa-list--unstyled { - @include at-media-max("tablet") { - @include u-padding-x(2); - @include u-padding-y(2); +.usa-footer--big .usa-footer__primary-section { + // more specified styles to align with parent web property usa.gov + h3 { + margin-top: 0; + } + + .usa-list--unstyled { + padding-bottom: 2rem; + padding-top: .75rem; + margin-top: 1rem; + + .usa-footer__secondary-link { + margin-bottom: 0; + } + } + // this keeps links aligned because title lengths are different + @include at-media(desktop) { + #col-2, + #col-4 { + > li:first-of-type { + padding-top: 22.4px; + } + } + } + + .usa-accordion { + &__content{ + background-color: initial; + } + + &__button { + background-color: #efefef; + font-size: 19.2px; + padding: 16px 16px 16px 40px; + } + + &__button[aria-expanded=false], + &__button[aria-expanded=true] { + background-image: url("../../assets/img/usa-icons/navigate_next.svg"); + background-position: left 1rem center; + background-size: 20px; + } + + &__button[aria-expanded=true] { + background-image: url("../../assets/img/usa-icons/expand_more.svg"); + text-decoration: underline; + } } } @@ -146,6 +191,7 @@ $AZ-button-disabled: #859cba; .usa-button { background-color: color("cyan-30v"); color: $black; + border: 1px $black solid; &:hover { background-color: #00a6d2; @@ -196,7 +242,6 @@ h1.text-secondary { } .usa-gov-footer__primary-link { - min-height: units(6); font-size: size("ui", 7); } @@ -205,10 +250,11 @@ h1.text-secondary { } .usa-sign-up { - @include u-padding-top(5); + @include u-padding-top(3); } .usa-identifier__section { + text-align: center; @include u-padding-bottom(0); } diff --git a/components/BetaUsaGovFooter.vue b/components/BetaUsaGovFooter.vue index 123c129471..b6d3831ea2 100644 --- a/components/BetaUsaGovFooter.vue +++ b/components/BetaUsaGovFooter.vue @@ -21,7 +21,7 @@