From 0c11ba1fe3fa96e0ac4459e14572a563e211ebf3 Mon Sep 17 00:00:00 2001 From: Mandy Lloyd <121046395+mlloydbixal@users.noreply.github.com> Date: Mon, 18 Dec 2023 16:15:42 -0500 Subject: [PATCH] VOTE-594: fix broken nvrf styling (#958) --- assets/styles/component/alert.scss | 63 +++++++++++------------- assets/styles/component/buttons.scss | 8 +++ assets/styles/nvrf.scss | 21 -------- layouts/partials/alert-notification.html | 16 +++--- layouts/partials/header.html | 16 +++--- 5 files changed, 56 insertions(+), 68 deletions(-) diff --git a/assets/styles/component/alert.scss b/assets/styles/component/alert.scss index e73e3b708..4691279c1 100644 --- a/assets/styles/component/alert.scss +++ b/assets/styles/component/alert.scss @@ -1,46 +1,43 @@ @use 'uswds-core' as *; @use '../mixins' as *; -.usa-alert { - padding: 0; - margin-top: 0; - border-left: 0.5rem solid #00bde3; -} +.sitewide-alert, .page-alert { + .usa-alert { + padding: 0; + margin-top: 0; + border-left: 0.5rem solid #00bde3; + } -[dir="rtl"] .usa-alert { - border-right: 0.5rem solid #00bde3; - border-left: 0; -} + [dir="rtl"] .usa-alert { + border-right: 0.5rem solid #00bde3; + border-left: 0; + } -.usa-alert--info:before { - display: none; -} + .usa-alert--info:before { + display: none; + } -.usa-alert--info { - background-image: unset; - background-color: #e7f6f8; - border: 0; -} + .usa-alert--info { + background-image: unset; + background-color: #e7f6f8; + border: 0; + } -[dir="rtl"] .usa-alert--info { - .grid-container { - background-position: calc(100% - 1rem) 1rem; + [dir="rtl"] .usa-alert--info { + .grid-container { + background-position: calc(100% - 1rem) 1rem; - @include at-media('tablet') { - background-position: calc(100% - 1rem) 0.3rem; + @include at-media('tablet') { + background-position: calc(100% - 1rem) 0.3rem; + } } } -} - -.usa-alert--info .usa-alert__body { - padding-left: 2.5rem; - &:before { - left: -0.5rem; - } -} + .usa-alert--info .usa-alert__body { + padding-left: 2.5rem; -.usa-alert__text:only-child { - margin-bottom: 0.5rem; - padding: 0.75rem 0 0.25rem; + &:before { + left: -0.5rem; + } + } } diff --git a/assets/styles/component/buttons.scss b/assets/styles/component/buttons.scss index 6e7d91ca3..767e24cdd 100644 --- a/assets/styles/component/buttons.scss +++ b/assets/styles/component/buttons.scss @@ -12,6 +12,14 @@ margin-top: 1rem; margin-bottom: 3rem; } + + &.usa-button--outline, + &.usa-button--outline:hover, + &.usa-button--outline:focus { + background-color: transparent; + color: $color-blue-dark; + box-shadow: inset 0 0 0 2px $color-blue-dark; + } } .usa-button:hover, diff --git a/assets/styles/nvrf.scss b/assets/styles/nvrf.scss index 56d0e9390..83b157333 100644 --- a/assets/styles/nvrf.scss +++ b/assets/styles/nvrf.scss @@ -14,10 +14,6 @@ color: #b50909; } - .back-button { - background-color: transparent; - } - .divider-grey { display: inline-block; height: 1px; @@ -29,23 +25,6 @@ color: unset; } - .link-button-outline { - background-color: rgba(0,0,0,0); - box-shadow: inset 0 0 0 2px #11385B; - color: #11385B; - text-decoration: none; - } - - .link-button-outline:hover { - color: white !important; - background-color: #11385B; - } - - .link-button-filled { - color: white !important; - text-decoration: none; - } - /* Form */ @media only screen and (min-width: 640px) { .bottom { diff --git a/layouts/partials/alert-notification.html b/layouts/partials/alert-notification.html index 4455767f8..9dff5ffe8 100644 --- a/layouts/partials/alert-notification.html +++ b/layouts/partials/alert-notification.html @@ -1,8 +1,10 @@ -
- Please refer to the English translation page for the most updated voting information. -
++ Please refer to the English translation page for the most updated voting information. +
+- {{ replace $translation.register.alert_state__alert_after_election "%link%" (partial "links/state-alert-link.html" .)|safeHTML }} -
++ {{ replace $translation.register.alert_state__alert_after_election "%link%" (partial "links/state-alert-link.html" .)|safeHTML }} +
+