From c0734e2f5554f35a69d239de034f43269accf8f7 Mon Sep 17 00:00:00 2001 From: Xavier Metichecchia Date: Fri, 7 Jun 2024 09:51:34 -0400 Subject: [PATCH 001/122] Upload from db bak failing, adding debug steps --- scripts/pipeline/s3-backup-upload.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/pipeline/s3-backup-upload.sh b/scripts/pipeline/s3-backup-upload.sh index ef752d6db..2ac49e227 100755 --- a/scripts/pipeline/s3-backup-upload.sh +++ b/scripts/pipeline/s3-backup-upload.sh @@ -19,13 +19,13 @@ echo "Getting backup bucket credentials..." AWS_ACCESS_KEY_ID=$(echo "${s3_credentials}" | jq -r '.credentials.access_key_id') export AWS_ACCESS_KEY_ID - + bucket=$(echo "${s3_credentials}" | jq -r '.credentials.bucket') export bucket AWS_BUCKET="${bucket}" export AWS_BUCKET - + AWS_DEFAULT_REGION=$(echo "${s3_credentials}" | jq -r '.credentials.region') export AWS_DEFAULT_REGION @@ -49,7 +49,7 @@ echo "Checking AWS credentials..." fi done echo "Credentials Verified, Proceeding with Upload" - } + } echo "Uploading backup..." { From 7fc0a5cb6cc305467dbd1ea561d5d53c240527e8 Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 14:37:03 -0400 Subject: [PATCH 002/122] PXBF-1446-updated-button-styles: remove custom bf styles on buttons so we inherit usagov --- .../src/shared/components/Button/_index.scss | 42 ------------------- .../src/shared/components/Button/index.jsx | 6 +-- 2 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 benefit-finder/src/shared/components/Button/_index.scss diff --git a/benefit-finder/src/shared/components/Button/_index.scss b/benefit-finder/src/shared/components/Button/_index.scss deleted file mode 100644 index a8bf71435..000000000 --- a/benefit-finder/src/shared/components/Button/_index.scss +++ /dev/null @@ -1,42 +0,0 @@ -@use '../../styles/colors/_index.scss' as color; -@use '../../styles/mixins/_index.scss' as *; - -.bf-usa-button { - @include important-bold; - - background-color: color.$pop-blue; - color: color.$white; -} - -.bf-usa-button--unstyled { - @include p; - - background-color: transparent; - color: color.$pop-blue; -} - -.bf-usa-button.bf-usa-button--unstyled:hover { - background-color: transparent; - color: color.$pop-blue; -} - -.bf-usa-button:hover { - background-color: color.$marine; - color: color.$white; -} - -.bf-usa-button--outline { - background-color: color.$white; - color: color.$pop-blue; - box-shadow: inset 0 0 0 2px color.$pop-blue; -} - -.bf-usa-button--outline:hover { - background-color: color.$white; - color: color.$marine; - box-shadow: inset 0 0 0 2px color.$marine; -} - -.bf-usa-button--outline:focus { - box-shadow: inset 0 0 0 2px color.$white; -} diff --git a/benefit-finder/src/shared/components/Button/index.jsx b/benefit-finder/src/shared/components/Button/index.jsx index d0aca02ab..bff43ddca 100644 --- a/benefit-finder/src/shared/components/Button/index.jsx +++ b/benefit-finder/src/shared/components/Button/index.jsx @@ -3,7 +3,7 @@ import { useHandleClassName } from '../../hooks' import { Icon } from '../index' import Colors from '../../styles/colors/_index.js' import PropTypes from 'prop-types' -import './_index.scss' + /** * a functional component that renders a reactive button * @component @@ -55,8 +55,8 @@ function Button({ setDefaultClasses([ 'bf-usa-button', 'usa-button', - 'bf-usa-button--outline', - 'usa-button--outline', + 'bf-usa-button--secondary', + 'usa-button--secondary', ]) break case 'unstyled': From 5246e37c8f1e965f381b7b5946342b0191149a33 Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 14:37:32 -0400 Subject: [PATCH 003/122] PXBF-1446-updated-button-styles: remove custom styles from modal buttons so we inherit usagov --- .../src/shared/components/Modal/_index.scss | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/benefit-finder/src/shared/components/Modal/_index.scss b/benefit-finder/src/shared/components/Modal/_index.scss index 335076350..6e9003d1a 100644 --- a/benefit-finder/src/shared/components/Modal/_index.scss +++ b/benefit-finder/src/shared/components/Modal/_index.scss @@ -17,20 +17,9 @@ .bf-nav-item-one, .bf-nav-item-two { - @include important-bold; - &.bf-usa-button { - @include important-bold; - - background-color: color.$pop-blue; - color: color.$white; width: $button-max-width; } - - &.bf-usa-button:hover { - background-color: color.$officer-navy; - color: color.$white; - } } .bf-modal-heading { From 1de066ac16071a854500173ddffe96bf9a6297ad Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 14:38:16 -0400 Subject: [PATCH 004/122] PXBF-1446-updated-button-styles: remove custom button styles from obfuscated links --- benefit-finder/src/shared/components/ObfuscatedLink/_index.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/benefit-finder/src/shared/components/ObfuscatedLink/_index.scss b/benefit-finder/src/shared/components/ObfuscatedLink/_index.scss index 0feac90a3..eb26cdab9 100644 --- a/benefit-finder/src/shared/components/ObfuscatedLink/_index.scss +++ b/benefit-finder/src/shared/components/ObfuscatedLink/_index.scss @@ -5,10 +5,8 @@ padding-right: 50px; padding-left: 50px; text-decoration: none; - color: color.$white !important; &:visited { text-decoration: none; - color: color.$white; } } From 2e188b2f7473edc98797d974a066b931b62835aa Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 14:38:42 -0400 Subject: [PATCH 005/122] PXBF-1446-updated-button-styles: outline to secondary update snapshots --- .../__tests__/__snapshots__/index.spec.jsx.snap | 2 +- .../__tests__/__snapshots__/index.spec.jsx.snap | 2 +- .../__tests__/__snapshots__/index.spec.jsx.snap | 2 +- .../__tests__/__snapshots__/index.spec.jsx.snap | 8 ++++---- .../__tests__/__snapshots__/index.spec.jsx.snap | 2 +- .../__tests__/__snapshots__/index.spec.jsx.snap | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/benefit-finder/src/shared/components/EmailButton/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/EmailButton/__tests__/__snapshots__/index.spec.jsx.snap index d0a331f42..1700b7b7e 100644 --- a/benefit-finder/src/shared/components/EmailButton/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/EmailButton/__tests__/__snapshots__/index.spec.jsx.snap @@ -3,7 +3,7 @@ exports[`Email > renders a match to the previous snapshot 1`] = ` From dd133dee7b2237e909e38d17d4195f93bad8dcd3 Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 14:46:44 -0400 Subject: [PATCH 007/122] PXBF-1446-updated-button-styles: updated snaps --- .../ResultsView/__tests__/__snapshots__/index.spec.jsx.snap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap index 37aba0ff5..3006a3d24 100644 --- a/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap @@ -6516,7 +6516,7 @@ exports[`loads view 1`] = `

+ ) } From ae1993fd7f1fe87f42a5033eb3783866bdcc0a41 Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 14:51:56 -0400 Subject: [PATCH 009/122] PXBF-1446-updated-button-styles: updated snaps --- .../__snapshots__/index.spec.jsx.snap | 52 +++---------------- .../__snapshots__/index.spec.jsx.snap | 26 ++-------- .../__snapshots__/index.spec.jsx.snap | 52 +++---------------- 3 files changed, 15 insertions(+), 115 deletions(-) diff --git a/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap index af7a2506a..00c99433a 100644 --- a/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap @@ -6979,31 +6979,11 @@ exports[`loads window query scenario 1 1`] = ` Share link - + @@ -13747,31 +13727,11 @@ exports[`loads window query scenario 2 1`] = ` Share link - + diff --git a/benefit-finder/src/shared/components/EmailButton/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/EmailButton/__tests__/__snapshots__/index.spec.jsx.snap index 1700b7b7e..413731bcd 100644 --- a/benefit-finder/src/shared/components/EmailButton/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/EmailButton/__tests__/__snapshots__/index.spec.jsx.snap @@ -2,30 +2,10 @@ exports[`Email > renders a match to the previous snapshot 1`] = ` - + `; diff --git a/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap index 3006a3d24..9b1c60fbc 100644 --- a/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap @@ -6565,31 +6565,11 @@ exports[`loads view 1`] = ` Share link - + @@ -13164,31 +13144,11 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite Share link - + From 56800c8caf3eff4edeb9ab51739b4d0eae3ad03d Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 14:57:24 -0400 Subject: [PATCH 010/122] PXBF-1446-updated-button-styles: replace email button with an unstyled email trigger --- .../src/shared/components/EmailButton/_index.scss | 15 --------------- .../__tests__/index.spec.jsx | 4 ++-- .../{EmailButton => EmailTrigger}/index.jsx | 7 +++---- .../index.stories.jsx | 4 ++-- .../src/shared/components/ResultsView/index.jsx | 4 ++-- benefit-finder/src/shared/components/index.js | 2 +- 6 files changed, 10 insertions(+), 26 deletions(-) delete mode 100644 benefit-finder/src/shared/components/EmailButton/_index.scss rename benefit-finder/src/shared/components/{EmailButton => EmailTrigger}/__tests__/index.spec.jsx (66%) rename benefit-finder/src/shared/components/{EmailButton => EmailTrigger}/index.jsx (88%) rename benefit-finder/src/shared/components/{EmailButton => EmailTrigger}/index.stories.jsx (51%) diff --git a/benefit-finder/src/shared/components/EmailButton/_index.scss b/benefit-finder/src/shared/components/EmailButton/_index.scss deleted file mode 100644 index 3a196bfb3..000000000 --- a/benefit-finder/src/shared/components/EmailButton/_index.scss +++ /dev/null @@ -1,15 +0,0 @@ -@use '../../styles/sizes/_index.scss' as *; - -.bf-email-button.bf-usa-button { - width: $button-max-width; - - i { - position: relative; - top: 3px; - right: 10px; - - svg { - height: 18px; - } - } -} diff --git a/benefit-finder/src/shared/components/EmailButton/__tests__/index.spec.jsx b/benefit-finder/src/shared/components/EmailTrigger/__tests__/index.spec.jsx similarity index 66% rename from benefit-finder/src/shared/components/EmailButton/__tests__/index.spec.jsx rename to benefit-finder/src/shared/components/EmailTrigger/__tests__/index.spec.jsx index 01e68e235..e5233c08f 100644 --- a/benefit-finder/src/shared/components/EmailButton/__tests__/index.spec.jsx +++ b/benefit-finder/src/shared/components/EmailTrigger/__tests__/index.spec.jsx @@ -1,9 +1,9 @@ import { render } from '@testing-library/react' -import EmailButton from '../index.jsx' +import EmailTrigger from '../index.jsx' describe('Email', () => { it('renders a match to the previous snapshot', () => { - const { asFragment } = render() + const { asFragment } = render() expect(asFragment()).toMatchSnapshot() }) }) diff --git a/benefit-finder/src/shared/components/EmailButton/index.jsx b/benefit-finder/src/shared/components/EmailTrigger/index.jsx similarity index 88% rename from benefit-finder/src/shared/components/EmailButton/index.jsx rename to benefit-finder/src/shared/components/EmailTrigger/index.jsx index 3e4ad1ba3..6d515a9c3 100644 --- a/benefit-finder/src/shared/components/EmailButton/index.jsx +++ b/benefit-finder/src/shared/components/EmailTrigger/index.jsx @@ -1,13 +1,12 @@ import { useState } from 'react' import { buildURIParameter } from '../../utils' -import './_index.scss' /** * a functional component that renders a button with mailto email context * @component * @return {html} returns a semantic html button element with a custom function onClick event */ -const EmailButton = ({ ui, data }) => { +const EmailTrigger = ({ ui, data }) => { /** * a state hook that contains the window location href * @return {string} current state of window location href @@ -28,9 +27,9 @@ const EmailButton = ({ ui, data }) => { return ( - {ui?.emailButton || 'Email'} + {ui?.EmailTrigger || 'Email'} ) } -export default EmailButton +export default EmailTrigger diff --git a/benefit-finder/src/shared/components/EmailButton/index.stories.jsx b/benefit-finder/src/shared/components/EmailTrigger/index.stories.jsx similarity index 51% rename from benefit-finder/src/shared/components/EmailButton/index.stories.jsx rename to benefit-finder/src/shared/components/EmailTrigger/index.stories.jsx index 72e35d38d..fdb17cd6f 100644 --- a/benefit-finder/src/shared/components/EmailButton/index.stories.jsx +++ b/benefit-finder/src/shared/components/EmailTrigger/index.stories.jsx @@ -1,7 +1,7 @@ -import EmailButton from './index.jsx' +import EmailTrigger from './index.jsx' export default { - component: EmailButton, + component: EmailTrigger, tags: ['autodocs'], } diff --git a/benefit-finder/src/shared/components/ResultsView/index.jsx b/benefit-finder/src/shared/components/ResultsView/index.jsx index dfecfa47d..357ebff4c 100644 --- a/benefit-finder/src/shared/components/ResultsView/index.jsx +++ b/benefit-finder/src/shared/components/ResultsView/index.jsx @@ -5,7 +5,7 @@ import PropTypes from 'prop-types' import { BenefitAccordionGroup, Button, - EmailButton, + EmailTrigger, Heading, StepBackLink, Chevron, @@ -254,7 +254,7 @@ const ResultsView = ({ stepDataArray && apiCalls.GET.SelectedValueAll(stepDataArray) } /> - Date: Mon, 17 Jun 2024 14:57:57 -0400 Subject: [PATCH 011/122] PXBF-1446-updated-button-styles: update email trigger key in ui object --- benefit-finder/src/shared/locales/en/en.json | 2 +- benefit-finder/src/shared/locales/es/es.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/benefit-finder/src/shared/locales/en/en.json b/benefit-finder/src/shared/locales/en/en.json index 6ec86ad91..d6af273b8 100644 --- a/benefit-finder/src/shared/locales/en/en.json +++ b/benefit-finder/src/shared/locales/en/en.json @@ -139,7 +139,7 @@ "heading": "Share results", "shareButton": "Share link", "shareLinkContent": "Copied", - "emailButton": "Email results", + "emailTrigger": "Email results", "emailSubject": "Results from USAGov’s benefit finder", "description": "Copy or email these results. Your answers will be visible. Only share with those you trust." } diff --git a/benefit-finder/src/shared/locales/es/es.json b/benefit-finder/src/shared/locales/es/es.json index 74873b516..8cfc3719a 100644 --- a/benefit-finder/src/shared/locales/es/es.json +++ b/benefit-finder/src/shared/locales/es/es.json @@ -139,7 +139,7 @@ "shareResults": { "heading": "Imprima y comparta", "shareButton": "Compartir resultados", - "emailButton": "Enviar resultados", + "emailTrigger": "Enviar resultados", "shareLinkContent": "Copiado", "emailSubject": "Resultados del buscador de beneficios de USAGov", "description": "Copie o envíe sus resultados por correo. Sus respuestas serán visibles. Solo comparta con quienes confíe." From 3a2b093ab1b491ca1a28ed3b90cea10ba25ff41d Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 14:58:05 -0400 Subject: [PATCH 012/122] PXBF-1446-updated-button-styles: updated snaps --- .../src/App/__tests__/__snapshots__/index.spec.jsx.snap | 4 ++-- .../__tests__/__snapshots__/index.spec.jsx.snap | 0 .../ResultsView/__tests__/__snapshots__/index.spec.jsx.snap | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename benefit-finder/src/shared/components/{EmailButton => EmailTrigger}/__tests__/__snapshots__/index.spec.jsx.snap (100%) diff --git a/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap index 00c99433a..ee466977c 100644 --- a/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap @@ -6982,7 +6982,7 @@ exports[`loads window query scenario 1 1`] = ` - Email results + Email @@ -13730,7 +13730,7 @@ exports[`loads window query scenario 2 1`] = ` - Email results + Email diff --git a/benefit-finder/src/shared/components/EmailButton/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/EmailTrigger/__tests__/__snapshots__/index.spec.jsx.snap similarity index 100% rename from benefit-finder/src/shared/components/EmailButton/__tests__/__snapshots__/index.spec.jsx.snap rename to benefit-finder/src/shared/components/EmailTrigger/__tests__/__snapshots__/index.spec.jsx.snap diff --git a/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap index 9b1c60fbc..76219f969 100644 --- a/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap @@ -6568,7 +6568,7 @@ exports[`loads view 1`] = ` - Email results + Email @@ -13147,7 +13147,7 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - Email results + Email From 0739d2fbf6dec66a9e1110bfad5ec209224352b0 Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 14:59:08 -0400 Subject: [PATCH 013/122] PXBF-1446-updated-button-styles: update key in presentation layer --- benefit-finder/src/shared/components/EmailTrigger/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benefit-finder/src/shared/components/EmailTrigger/index.jsx b/benefit-finder/src/shared/components/EmailTrigger/index.jsx index 6d515a9c3..b9ecff5f5 100644 --- a/benefit-finder/src/shared/components/EmailTrigger/index.jsx +++ b/benefit-finder/src/shared/components/EmailTrigger/index.jsx @@ -27,7 +27,7 @@ const EmailTrigger = ({ ui, data }) => { return ( - {ui?.EmailTrigger || 'Email'} + {ui?.emailTrigger || 'Email'} ) } From 84b3b187b4594d85d6fc8df4865408d767d099d8 Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 14:59:22 -0400 Subject: [PATCH 014/122] PXBF-1446-updated-button-styles: updated snaps --- .../src/App/__tests__/__snapshots__/index.spec.jsx.snap | 4 ++-- .../ResultsView/__tests__/__snapshots__/index.spec.jsx.snap | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap index ee466977c..00c99433a 100644 --- a/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap @@ -6982,7 +6982,7 @@ exports[`loads window query scenario 1 1`] = ` - Email + Email results @@ -13730,7 +13730,7 @@ exports[`loads window query scenario 2 1`] = ` - Email + Email results diff --git a/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap index 76219f969..9b1c60fbc 100644 --- a/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap @@ -6568,7 +6568,7 @@ exports[`loads view 1`] = ` - Email + Email results @@ -13147,7 +13147,7 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - Email + Email results From 01e689675a406da193398dc08b3f5cfbc8ac7e56 Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 15:48:19 -0400 Subject: [PATCH 015/122] PXBF-1446-updated-button-styles: update to include href void in trigger --- benefit-finder/src/shared/components/EmailTrigger/index.jsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/benefit-finder/src/shared/components/EmailTrigger/index.jsx b/benefit-finder/src/shared/components/EmailTrigger/index.jsx index b9ecff5f5..ff0002db9 100644 --- a/benefit-finder/src/shared/components/EmailTrigger/index.jsx +++ b/benefit-finder/src/shared/components/EmailTrigger/index.jsx @@ -26,7 +26,11 @@ const EmailTrigger = ({ ui, data }) => { } return ( - + {ui?.emailTrigger || 'Email'} ) From 587a6f597f929a7d068ccd28049080323df8e54c Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 15:48:37 -0400 Subject: [PATCH 016/122] PXBF-1446-updated-button-styles: updated snaps --- .../src/App/__tests__/__snapshots__/index.spec.jsx.snap | 6 ++++-- .../__tests__/__snapshots__/index.spec.jsx.snap | 3 ++- .../ResultsView/__tests__/__snapshots__/index.spec.jsx.snap | 6 ++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap index 00c99433a..5f936fc96 100644 --- a/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap @@ -6980,7 +6980,8 @@ exports[`loads window query scenario 1 1`] = ` Share link Email results @@ -13728,7 +13729,8 @@ exports[`loads window query scenario 2 1`] = ` Share link Email results diff --git a/benefit-finder/src/shared/components/EmailTrigger/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/EmailTrigger/__tests__/__snapshots__/index.spec.jsx.snap index 413731bcd..5a1c4452a 100644 --- a/benefit-finder/src/shared/components/EmailTrigger/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/EmailTrigger/__tests__/__snapshots__/index.spec.jsx.snap @@ -3,7 +3,8 @@ exports[`Email > renders a match to the previous snapshot 1`] = ` Email diff --git a/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap index 9b1c60fbc..b242debbb 100644 --- a/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap @@ -6566,7 +6566,8 @@ exports[`loads view 1`] = ` Share link Email results @@ -13145,7 +13146,8 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite Share link Email results From 46e7bf5d4de6b27459b67fef9feed29e4ccd9c9e Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 16:03:28 -0400 Subject: [PATCH 017/122] PXBF-1446-updated-button-styles: replace share button with a share trigger anchor --- .../src/App/__tests__/index.spec.jsx | 2 +- .../shared/components/ResultsView/index.jsx | 36 +++++++++++-------- .../__snapshots__/index.spec.jsx.snap | 32 ----------------- .../shared/components/ShareButton/_index.scss | 15 -------- .../__tests__/index.spec.jsx | 4 +-- .../{ShareButton => ShareTrigger}/index.jsx | 24 ++++++------- .../index.stories.jsx | 4 +-- benefit-finder/src/shared/components/index.js | 2 +- 8 files changed, 38 insertions(+), 81 deletions(-) delete mode 100644 benefit-finder/src/shared/components/ShareButton/__tests__/__snapshots__/index.spec.jsx.snap delete mode 100644 benefit-finder/src/shared/components/ShareButton/_index.scss rename benefit-finder/src/shared/components/{ShareButton => ShareTrigger}/__tests__/index.spec.jsx (66%) rename benefit-finder/src/shared/components/{ShareButton => ShareTrigger}/index.jsx (71%) rename benefit-finder/src/shared/components/{ShareButton => ShareTrigger}/index.stories.jsx (51%) diff --git a/benefit-finder/src/App/__tests__/index.spec.jsx b/benefit-finder/src/App/__tests__/index.spec.jsx index 72cfd2e4e..0917b0330 100644 --- a/benefit-finder/src/App/__tests__/index.spec.jsx +++ b/benefit-finder/src/App/__tests__/index.spec.jsx @@ -38,7 +38,7 @@ for (const scenario of scenarios.death) { await screen.findByTestId('app') await screen.findAllByTestId('benefit') await screen.findAllByTestId('bf-result-view') - await screen.findAllByTestId('bf-share-button') + await screen.findAllByTestId('bf-share-trigger') expect(view.baseElement).toMatchSnapshot() }) } diff --git a/benefit-finder/src/shared/components/ResultsView/index.jsx b/benefit-finder/src/shared/components/ResultsView/index.jsx index 357ebff4c..a6a68006e 100644 --- a/benefit-finder/src/shared/components/ResultsView/index.jsx +++ b/benefit-finder/src/shared/components/ResultsView/index.jsx @@ -9,7 +9,7 @@ import { Heading, StepBackLink, Chevron, - ShareButton, + ShareTrigger, RelativeBenefitList, Summary, } from '../index' @@ -247,20 +247,26 @@ const ResultsView = ({ {shareResults?.heading}

{shareResults?.description}

-
- - -
+
    +
  • + +
    • +
  • + +
    • +
diff --git a/benefit-finder/src/shared/components/ShareButton/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/ShareButton/__tests__/__snapshots__/index.spec.jsx.snap deleted file mode 100644 index 76dbeb643..000000000 --- a/benefit-finder/src/shared/components/ShareButton/__tests__/__snapshots__/index.spec.jsx.snap +++ /dev/null @@ -1,32 +0,0 @@ -// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html - -exports[`Share > renders a match to the previous snapshot 1`] = ` - - - -`; diff --git a/benefit-finder/src/shared/components/ShareButton/_index.scss b/benefit-finder/src/shared/components/ShareButton/_index.scss deleted file mode 100644 index a27da5df8..000000000 --- a/benefit-finder/src/shared/components/ShareButton/_index.scss +++ /dev/null @@ -1,15 +0,0 @@ -@use '../../styles/sizes/_index.scss' as *; - -.bf-share-button.bf-usa-button { - width: $button-max-width; - - i { - position: relative; - top: 3px; - right: 10px; - - svg { - height: 18px; - } - } -} diff --git a/benefit-finder/src/shared/components/ShareButton/__tests__/index.spec.jsx b/benefit-finder/src/shared/components/ShareTrigger/__tests__/index.spec.jsx similarity index 66% rename from benefit-finder/src/shared/components/ShareButton/__tests__/index.spec.jsx rename to benefit-finder/src/shared/components/ShareTrigger/__tests__/index.spec.jsx index bdbff619e..21c04ffef 100644 --- a/benefit-finder/src/shared/components/ShareButton/__tests__/index.spec.jsx +++ b/benefit-finder/src/shared/components/ShareTrigger/__tests__/index.spec.jsx @@ -1,9 +1,9 @@ import { render } from '@testing-library/react' -import ShareButton from '../index.jsx' +import ShareTrigger from '../index.jsx' describe('Share', () => { it('renders a match to the previous snapshot', () => { - const { asFragment } = render() + const { asFragment } = render() expect(asFragment()).toMatchSnapshot() }) }) diff --git a/benefit-finder/src/shared/components/ShareButton/index.jsx b/benefit-finder/src/shared/components/ShareTrigger/index.jsx similarity index 71% rename from benefit-finder/src/shared/components/ShareButton/index.jsx rename to benefit-finder/src/shared/components/ShareTrigger/index.jsx index 47f23049a..f76702a52 100644 --- a/benefit-finder/src/shared/components/ShareButton/index.jsx +++ b/benefit-finder/src/shared/components/ShareTrigger/index.jsx @@ -1,7 +1,5 @@ import { useState } from 'react' -import { Button } from '../index' import { buildURIParameter } from '../../utils' -import './_index.scss' /** * a functional component that renders a button with copy-to-cipboard functionality @@ -9,7 +7,7 @@ import './_index.scss' * @return {html} returns a semantic html button element with a custom function onClick event */ -const ShareButton = ({ ui, data }) => { +const ShareTrigger = ({ ui, data }) => { /** * a state hook that contains the window location href * @return {string} current state of window location href @@ -21,7 +19,8 @@ const ShareButton = ({ ui, data }) => { /** * a handler that copies the current window location href to the users clipboard */ - const handleClick = () => { + const handleClick = e => { + e.preventDefault() setShareLink(buildURIParameter(window.location.href, data)) navigator.clipboard.writeText(shareLink).then( () => alert(`${ui?.shareLinkContent} ${shareLink}`), @@ -30,16 +29,15 @@ const ShareButton = ({ ui, data }) => { } return ( - + {ui?.shareTrigger || 'Share'} + ) } -export default ShareButton +export default ShareTrigger diff --git a/benefit-finder/src/shared/components/ShareButton/index.stories.jsx b/benefit-finder/src/shared/components/ShareTrigger/index.stories.jsx similarity index 51% rename from benefit-finder/src/shared/components/ShareButton/index.stories.jsx rename to benefit-finder/src/shared/components/ShareTrigger/index.stories.jsx index 48a1eb559..2a3e9c70c 100644 --- a/benefit-finder/src/shared/components/ShareButton/index.stories.jsx +++ b/benefit-finder/src/shared/components/ShareTrigger/index.stories.jsx @@ -1,7 +1,7 @@ -import ShareButton from './index.jsx' +import ShareTrigger from './index.jsx' export default { - component: ShareButton, + component: ShareTrigger, tags: ['autodocs'], } diff --git a/benefit-finder/src/shared/components/index.js b/benefit-finder/src/shared/components/index.js index 22f30cafb..05eeb93bd 100644 --- a/benefit-finder/src/shared/components/index.js +++ b/benefit-finder/src/shared/components/index.js @@ -27,7 +27,7 @@ export { default as ProcessList } from './ProcessList' export { default as Radio } from './Radio' export { default as RelativeBenefitList } from './RelativeBenefitList' export { default as ResultsView } from './ResultsView' -export { default as ShareButton } from './ShareButton' +export { default as ShareTrigger } from './ShareTrigger' export { default as StepIndicator } from './StepIndicator' export { default as StepBackLink } from './StepBackLink' export { default as Select } from './Select' From fd71f7438a4f5cff197844ac1c41c4453ef32e3b Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 16:03:46 -0400 Subject: [PATCH 018/122] PXBF-1446-updated-button-styles: update ui key --- benefit-finder/src/shared/locales/en/en.json | 2 +- benefit-finder/src/shared/locales/es/es.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/benefit-finder/src/shared/locales/en/en.json b/benefit-finder/src/shared/locales/en/en.json index d6af273b8..11b750d8b 100644 --- a/benefit-finder/src/shared/locales/en/en.json +++ b/benefit-finder/src/shared/locales/en/en.json @@ -137,7 +137,7 @@ }, "shareResults": { "heading": "Share results", - "shareButton": "Share link", + "shareTrigger": "Share link", "shareLinkContent": "Copied", "emailTrigger": "Email results", "emailSubject": "Results from USAGov’s benefit finder", diff --git a/benefit-finder/src/shared/locales/es/es.json b/benefit-finder/src/shared/locales/es/es.json index 8cfc3719a..efe0a2447 100644 --- a/benefit-finder/src/shared/locales/es/es.json +++ b/benefit-finder/src/shared/locales/es/es.json @@ -138,7 +138,7 @@ }, "shareResults": { "heading": "Imprima y comparta", - "shareButton": "Compartir resultados", + "shareTrigger": "Compartir resultados", "emailTrigger": "Enviar resultados", "shareLinkContent": "Copiado", "emailSubject": "Resultados del buscador de beneficios de USAGov", From 6dd3fbda261063820424c170d1492179e4a3e1ea Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 16:04:12 -0400 Subject: [PATCH 019/122] PXBF-1446-updated-button-styles: catch event for more safe event handling --- .../src/shared/components/EmailTrigger/index.jsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/benefit-finder/src/shared/components/EmailTrigger/index.jsx b/benefit-finder/src/shared/components/EmailTrigger/index.jsx index ff0002db9..6e1607cb4 100644 --- a/benefit-finder/src/shared/components/EmailTrigger/index.jsx +++ b/benefit-finder/src/shared/components/EmailTrigger/index.jsx @@ -20,16 +20,17 @@ const EmailTrigger = ({ ui, data }) => { /** * a handler that triggers an email with context from the users window location href */ - const handleClick = () => { + const handleClick = e => { + e.preventDefault() setShareLink(buildURIParameter(window.location.href, data)) window.location = `mailto:?subject=${ui?.emailSubject}&body=${emailBody}` } return ( handleClick(e)} > {ui?.emailTrigger || 'Email'} From 330ca310eee85bcb005f8bf8c6b6affcada67746 Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 16:04:37 -0400 Subject: [PATCH 020/122] PXBF-1446-updated-button-styles: left align links in list --- benefit-finder/src/shared/components/ResultsView/_index.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benefit-finder/src/shared/components/ResultsView/_index.scss b/benefit-finder/src/shared/components/ResultsView/_index.scss index 25bae47af..3add2072a 100644 --- a/benefit-finder/src/shared/components/ResultsView/_index.scss +++ b/benefit-finder/src/shared/components/ResultsView/_index.scss @@ -59,7 +59,7 @@ } .bf-result-view-share-results { - text-align: center; + text-align: left; } .bf-result-view-share-results-button-group { From 32efeaa83843b7b6fc4222bcbff71cd2d1bf773a Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 16:04:45 -0400 Subject: [PATCH 021/122] PXBF-1446-updated-button-styles: updated specs --- .../__snapshots__/index.spec.jsx.snap | 106 +++++++----------- .../__snapshots__/index.spec.jsx.snap | 2 +- .../__snapshots__/index.spec.jsx.snap | 102 ++++++----------- .../__snapshots__/index.spec.jsx.snap | 13 +++ 4 files changed, 88 insertions(+), 135 deletions(-) create mode 100644 benefit-finder/src/shared/components/ShareTrigger/__tests__/__snapshots__/index.spec.jsx.snap diff --git a/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap index 5f936fc96..45a431906 100644 --- a/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap @@ -6950,42 +6950,27 @@ exports[`loads window query scenario 1 1`] = `

Copy or email these results. Your answers will be visible. Only share with those you trust.

-
- - - Email results - -
+
  • + + Share link + +
    • +
  • + + Email results + +
    • + @@ -13699,42 +13684,27 @@ exports[`loads window query scenario 2 1`] = `

    Copy or email these results. Your answers will be visible. Only share with those you trust.

    -
    - - - Email results - -
    +
  • + + Share link + +
    • +
  • + + Email results + +
    • + diff --git a/benefit-finder/src/shared/components/EmailTrigger/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/EmailTrigger/__tests__/__snapshots__/index.spec.jsx.snap index 5a1c4452a..db533466e 100644 --- a/benefit-finder/src/shared/components/EmailTrigger/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/EmailTrigger/__tests__/__snapshots__/index.spec.jsx.snap @@ -4,7 +4,7 @@ exports[`Email > renders a match to the previous snapshot 1`] = ` Email diff --git a/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap index b242debbb..a47181587 100644 --- a/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap @@ -6536,42 +6536,27 @@ exports[`loads view 1`] = `

    Copy or email these results. Your answers will be visible. Only share with those you trust.

    -
    - - - Email results - -
    + Share link + + +
  • + + Email results + +
    • + @@ -13116,42 +13101,27 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite

    Copy or email these results. Your answers will be visible. Only share with those you trust.

    -
    - - - Email results - -
    + Share link + + +
  • + + Email results + +
    • + diff --git a/benefit-finder/src/shared/components/ShareTrigger/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/ShareTrigger/__tests__/__snapshots__/index.spec.jsx.snap new file mode 100644 index 000000000..d1534ea1b --- /dev/null +++ b/benefit-finder/src/shared/components/ShareTrigger/__tests__/__snapshots__/index.spec.jsx.snap @@ -0,0 +1,13 @@ +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html + +exports[`Share > renders a match to the previous snapshot 1`] = ` + + + Share + + +`; From 393ad441d38c4addf137a8626df6f853e5f45a3e Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 16:36:52 -0400 Subject: [PATCH 022/122] PXBF-1446-updated-button-styles: correct prop type --- .../src/shared/components/BenefitAccordionGroup/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benefit-finder/src/shared/components/BenefitAccordionGroup/index.jsx b/benefit-finder/src/shared/components/BenefitAccordionGroup/index.jsx index 300c02132..e135155f7 100644 --- a/benefit-finder/src/shared/components/BenefitAccordionGroup/index.jsx +++ b/benefit-finder/src/shared/components/BenefitAccordionGroup/index.jsx @@ -44,7 +44,7 @@ const BenefitAccordionGroup = ({ /** * a function that returns the string value of our expanded action * @function - * @return {stroing} returns label for our button + * @return {string} returns label for our button */ const handleExpandIcon = isExpandAll ? `${openState} -` : `${closedState} +` From 34bde9a2946fe5b86795bee0f169e2c75dfbeebe Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 16:37:26 -0400 Subject: [PATCH 023/122] PXBF-1446-updated-button-styles: bring in outline styles to overide usagov default outline style --- .../src/shared/components/Button/index.jsx | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/benefit-finder/src/shared/components/Button/index.jsx b/benefit-finder/src/shared/components/Button/index.jsx index bff43ddca..a65295c06 100644 --- a/benefit-finder/src/shared/components/Button/index.jsx +++ b/benefit-finder/src/shared/components/Button/index.jsx @@ -3,6 +3,7 @@ import { useHandleClassName } from '../../hooks' import { Icon } from '../index' import Colors from '../../styles/colors/_index.js' import PropTypes from 'prop-types' +import './_index.scss' /** * a functional component that renders a reactive button @@ -23,6 +24,7 @@ function Button({ className, onClick, secondary, + outline, disabled, unstyled, type, @@ -31,7 +33,13 @@ function Button({ }) { const [defaultClasses, setDefaultClasses] = useState(null) const style = - secondary === true ? 'secondary' : unstyled === true ? 'unstyled' : null + secondary === true + ? 'secondary' + : outline === true + ? 'outline' + : unstyled === true + ? 'unstyled' + : null /** * a state hook that contains that handles the synthetic hover value * @return {boolean} current state of mouseOver/mouseLeave @@ -59,6 +67,14 @@ function Button({ 'usa-button--secondary', ]) break + case 'outline': + setDefaultClasses([ + 'bf-usa-button', + 'usa-button', + 'bf-usa-button--outline', + 'usa-button--outline', + ]) + break case 'unstyled': setDefaultClasses([ 'bf-usa-button', From e733e3d43f14ea9d546fc8e679a2ee97450a9cfc Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 16:38:09 -0400 Subject: [PATCH 024/122] PXBF-1446-updated-button-styles: update button group story --- .../src/shared/components/ButtonGroup/index.stories.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/benefit-finder/src/shared/components/ButtonGroup/index.stories.jsx b/benefit-finder/src/shared/components/ButtonGroup/index.stories.jsx index e5dcb3ff1..c72aeae93 100644 --- a/benefit-finder/src/shared/components/ButtonGroup/index.stories.jsx +++ b/benefit-finder/src/shared/components/ButtonGroup/index.stories.jsx @@ -5,11 +5,12 @@ export default { tags: ['autodocs'], args: { buttonOne: { - secondary: true, + outline: true, children: 'Back', onClick: () => alert('navigate back'), }, buttonTwo: { + secondary: true, children: 'Continue', onClick: () => alert('navigate forward'), }, From 039275fe8a9376b279c48c676e18e87f5d99c0a7 Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 16:38:34 -0400 Subject: [PATCH 025/122] PXBF-1446-updated-button-styles: update description --- benefit-finder/src/shared/components/EmailTrigger/index.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/benefit-finder/src/shared/components/EmailTrigger/index.jsx b/benefit-finder/src/shared/components/EmailTrigger/index.jsx index 6e1607cb4..73a57cb3d 100644 --- a/benefit-finder/src/shared/components/EmailTrigger/index.jsx +++ b/benefit-finder/src/shared/components/EmailTrigger/index.jsx @@ -2,9 +2,9 @@ import { useState } from 'react' import { buildURIParameter } from '../../utils' /** - * a functional component that renders a button with mailto email context + * a functional component that renders a anchor with mailto email context * @component - * @return {html} returns a semantic html button element with a custom function onClick event + * @return {html} returns a semantic html anchor element with a custom function onClick event */ const EmailTrigger = ({ ui, data }) => { /** From 10ca0fa326291d9b4ddf59077bc9864243c0f361 Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 16:40:30 -0400 Subject: [PATCH 026/122] PXBF-1446-updated-button-styles: update description --- benefit-finder/src/shared/components/Intro/index.jsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/benefit-finder/src/shared/components/Intro/index.jsx b/benefit-finder/src/shared/components/Intro/index.jsx index 559f23f72..b29064c1e 100644 --- a/benefit-finder/src/shared/components/Intro/index.jsx +++ b/benefit-finder/src/shared/components/Intro/index.jsx @@ -13,7 +13,7 @@ import { import './_index.scss' /** - * a functional component that renders a link as a button + * a compound component that renders the introductional start of the form process * @component * @param {object} data - inherited life event content * @param {object} ui - life event form ui translations @@ -76,7 +76,9 @@ const Intro = ({ data, ui, setStep, step }) => {
    - +
    From e381afbe08a04c61c62b0e9c68453ecc6c2c7d55 Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 16:41:13 -0400 Subject: [PATCH 027/122] PXBF-1446-updated-button-styles: updated description --- .../src/shared/components/KeyElegibilityCrieriaList/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benefit-finder/src/shared/components/KeyElegibilityCrieriaList/index.jsx b/benefit-finder/src/shared/components/KeyElegibilityCrieriaList/index.jsx index cb6412b8e..02d174d46 100644 --- a/benefit-finder/src/shared/components/KeyElegibilityCrieriaList/index.jsx +++ b/benefit-finder/src/shared/components/KeyElegibilityCrieriaList/index.jsx @@ -4,7 +4,7 @@ import { useHandleClassName } from '../../hooks' import './_index.scss' /** - * a functional component that renders a link as a button + * a functional component that renders a list of criteria related to eligiblity * @component * @param {string} className - inherited class names * @param {array} data - contains our criteria From 61d86ee2a31bcf05b7060970224a85f5975bff0a Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 16:41:47 -0400 Subject: [PATCH 028/122] PXBF-1446-updated-button-styles: update description --- .../src/shared/components/LifeEventSection/index.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/benefit-finder/src/shared/components/LifeEventSection/index.jsx b/benefit-finder/src/shared/components/LifeEventSection/index.jsx index a9c8f4069..e55d4f97e 100644 --- a/benefit-finder/src/shared/components/LifeEventSection/index.jsx +++ b/benefit-finder/src/shared/components/LifeEventSection/index.jsx @@ -17,7 +17,7 @@ import { import './_index.scss' /** - * a functional component that renders a link as a button + * a compound component that renders the main conditional view of the form * @component * @param {number} step - inherited current step value * @param {function} setStep - inherited function to inc/dec step value @@ -562,11 +562,11 @@ const LifeEventSection = ({ )}
    - {modal === false ? ( - ) : ( From 9ece746d34dc7bd30d1d2d9413c7663506b434dc Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 16:42:12 -0400 Subject: [PATCH 029/122] PXBF-1446-updated-button-styles: update modal buttons as secondary --- benefit-finder/src/shared/components/Modal/index.jsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/benefit-finder/src/shared/components/Modal/index.jsx b/benefit-finder/src/shared/components/Modal/index.jsx index 9148d2f8c..8a1963be7 100644 --- a/benefit-finder/src/shared/components/Modal/index.jsx +++ b/benefit-finder/src/shared/components/Modal/index.jsx @@ -158,6 +158,7 @@ const Modal = ({ onKeyDown={e => handleKeyDown(e, navItemOneFunction)} noCarrot tabIndex="0" + secondary > {navItemOneLabel} @@ -173,6 +174,7 @@ const Modal = ({ onKeyDown={e => handleKeyDown(e, navItemTwoFunction)} noCarrot tabIndex="0" + secondary > {navItemTwoLabel} From d40c3c0145cc41fb06ecadb1f299ed75702e6b9a Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 16:42:45 -0400 Subject: [PATCH 030/122] PXBF-1446-updated-button-styles: update form nav buttons as outline and secondary --- .../src/shared/components/VerifySelectionsView/index.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/benefit-finder/src/shared/components/VerifySelectionsView/index.jsx b/benefit-finder/src/shared/components/VerifySelectionsView/index.jsx index 19d129fab..8341abdba 100644 --- a/benefit-finder/src/shared/components/VerifySelectionsView/index.jsx +++ b/benefit-finder/src/shared/components/VerifySelectionsView/index.jsx @@ -174,10 +174,10 @@ const VerifySelectionsView = ({ })}
    - -
    From c917a44cebde4f9e46c911a8aa0d3a280d8e8f72 Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 16:43:16 -0400 Subject: [PATCH 031/122] PXBF-1446-updated-button-styles: bring in support for outline button style overrides --- .../src/shared/components/Button/_index.scss | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 benefit-finder/src/shared/components/Button/_index.scss diff --git a/benefit-finder/src/shared/components/Button/_index.scss b/benefit-finder/src/shared/components/Button/_index.scss new file mode 100644 index 000000000..16eacfb83 --- /dev/null +++ b/benefit-finder/src/shared/components/Button/_index.scss @@ -0,0 +1,11 @@ +.bf-usa-button--outline { + background-color: transparent; + box-shadow: inset 0 0 0 2px #000; + color: #000; +} + +.bf-usa-button--outline:focus { + background-color: transparent; + box-shadow: inset 0 0 0 2px #fff; + color: #000; +} From e42454707f9b72ff20fae38edbfa068748e97e1c Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Mon, 17 Jun 2024 16:43:23 -0400 Subject: [PATCH 032/122] PXBF-1446-updated-button-styles: updated snaps --- .../src/App/__tests__/__snapshots__/index.spec.jsx.snap | 2 +- .../Intro/__tests__/__snapshots__/index.spec.jsx.snap | 2 +- .../__tests__/__snapshots__/index.spec.jsx.snap | 4 ++-- .../__tests__/__snapshots__/index.spec.jsx.snap | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap index 45a431906..3408b55e2 100644 --- a/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap @@ -245,7 +245,7 @@ exports[`loads intro 1`] = ` class="bf-cta-wrapper" > +
    +

    + Results +

    +

    + + You may be eligible for these benefits: + +

    +
    +
    +

    + Important +

    +
    + +
    +
    +
    +
    +
    +
    + +
    +

    + +

    + +
    + + + + + + + + + + + + + +
    +

    + +

    + +
    + + + +
    +

    + +

    + +
    + + + + + + + + + + +
    +

    + +

    + +
    +
    +
    +
    +

    + Benefits you did not qualify for +

    +

    +

    + Based on your answers you are not eligible for these benefits. + + You may become eligible if you enter additional information or your situation changes. + +
    +

    + +
    +
    +

    + More benefits +

    + +
    +
    +

    + Share results +

    +

    + Copy or email these results. Your answers will be visible. Only share with those you trust. +

    +
    + + Share link + + + Email results + +
    +
    + + + + + + +`; + +exports[`loads window query scenario 2 1`] = ` + + +
    +
    +
    +
    +
    +

    + Your potential benefits +

    +
    +
    +

    + Visit each agency to find true eligibility and to apply. Check with your city, state, or employer for other benefits. +

    +
    +
    +
    +
    +
    +
    + +
    +

    + Results +

    +

    + + You may be eligible for these benefits: + +

    +
    +
    +

    + Important +

    +
    + +
    +
    +
    +
    +
    +
    + +
    +

    + +

    + +
    +
    +

    + +

    + +
    + + + + + + + + + + +
    +

    + +

    + +
    +
    +

    + +

    + +
    +
    +

    + +

    + +
    + + + + + + + + + + + + + + + +
    +
    +
    +

    + Benefits you did not qualify for +

    +

    +

    + Based on your answers you are not eligible for these benefits. + + You may become eligible if you enter additional information or your situation changes. + +
    +

    + +
    +
    +

    + More benefits +

    + +
    +
    +

    + Share results +

    +

    + Copy or email these results. Your answers will be visible. Only share with those you trust. +

    +
    + + Share link + + + Email results + +
    +
    +
    +
    +
    +
    +
    + +`; diff --git a/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap new file mode 100644 index 000000000..939cadac9 --- /dev/null +++ b/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap @@ -0,0 +1,13059 @@ +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html + +exports[`loads view 1`] = ` + + +
    +
    +
    +
    +

    + Your potential benefits +

    +
    +
    +

    + Visit each agency to find true eligibility and to apply. Check with your city, state, or employer for other benefits. +

    +
    +
    +
    +
    +
    +
    + +
    +

    + Results +

    +

    + + You may be eligible for these benefits: + +

    +
    +
    +

    + Important +

    +
    + +
    +
    +
    +
    +
    +
    + +
    +

    + +

    + +
    + + + + + + + + + + + +
    +

    + +

    + +
    + +
    +

    + +

    + +
    + + + +
    +

    + +

    + +
    + + + + + + + + + + +
    +

    + +

    + +
    +
    +
    +
    +

    + Benefits you did not qualify for +

    +

    +

    + Based on your answers you are not eligible for these benefits. + + You may become eligible if you enter additional information or your situation changes. + +
    +

    + +
    +
    +

    + Share results +

    +

    + Copy or email these results. Your answers will be visible. Only share with those you trust. +

    +
    + + Share link + + + Email results + +
    +
    +
    +
    +
    +
    + +`; + +exports[`scenario 1 loads in view with the correct amount of likely eligible items 1`] = ` + + +
    +
    +
    +
    +

    + Your potential benefits +

    +
    +
    +

    + Visit each agency to find true eligibility and to apply. Check with your city, state, or employer for other benefits. +

    +
    +
    +
    +
    +
    +
    + +
    +

    + Results +

    +

    + + You may be eligible for these benefits: + +

    +
    +
    +

    + Important +

    +
    + +
    +
    +
    +
    +
    +
    + +
    +

    + +

    + +
    + + + + + + + + + + + +
    +

    + +

    + +
    + +
    +

    + +

    + +
    + + + +
    +

    + +

    + +
    + + + + + + + + + + +
    +

    + +

    + +
    +
    +
    +
    +

    + Benefits you did not qualify for +

    +

    +

    + Based on your answers you are not eligible for these benefits. + + You may become eligible if you enter additional information or your situation changes. + +
    +

    + +
    +
    +

    + Share results +

    +

    + Copy or email these results. Your answers will be visible. Only share with those you trust. +

    +
    + + Share link + + + Email results + +
    +
    +
    +
    +
    +
    + +`; diff --git a/benefit-finder/src/shared/components/ResultsView/components/Results/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/ResultsView/components/Results/__tests__/__snapshots__/index.spec.jsx.snap new file mode 100644 index 000000000..e357f4526 --- /dev/null +++ b/benefit-finder/src/shared/components/ResultsView/components/Results/__tests__/__snapshots__/index.spec.jsx.snap @@ -0,0 +1,138 @@ +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html + +exports[`Results > renders a match to the previous snapshot 1`] = ` + +
    +
    +

    + Benefits you did not qualify for +

    +
    + According to your answers you are not eligible for these benefits. +
    +
    +
    +
    +
    + +
    +

    + Results +

    +

    + + You may be eligible for these benefits: + +

    +
    +
    +

    + Important +

    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +

    + Share results +

    +

    + Copy or email these results. Your answers will be visible. Only share with those you trust. +

    +
    + + Share link + + + Email results + +
    +
    +
    +
    + +`; From 3ce6830fc75d46e13293e0367352ad01b34e879d Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Fri, 9 Aug 2024 04:37:54 -0400 Subject: [PATCH 039/122] PXBF-1446-updated-button-styles: new px to rem converter --- .../src/shared/styles/functions/_index.scss | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 benefit-finder/src/shared/styles/functions/_index.scss diff --git a/benefit-finder/src/shared/styles/functions/_index.scss b/benefit-finder/src/shared/styles/functions/_index.scss new file mode 100644 index 000000000..c8c91d7bd --- /dev/null +++ b/benefit-finder/src/shared/styles/functions/_index.scss @@ -0,0 +1,15 @@ +@use 'sass:math'; + +// convert px to rem + +// USAGov font ratio is based on 16px +// for example h1 @ 2.44rem = 39.04px +$html-font-size: 16px; + +@function strip-unit($value) { + @return math.div($value, $value * 0 + 1); +} + +@function rem($pxValue) { + @return #{math.div(strip-unit($pxValue), strip-unit($html-font-size))}rem; +} From 1b48dc130d7c9080a2c728c639f0dd77d67196cc Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Fri, 9 Aug 2024 04:41:38 -0400 Subject: [PATCH 040/122] PXBF-1446-updated-button-styles: move pixal conversions to rem function --- .../shared/components/Accordion/_index.scss | 11 ++--- .../BenefitAccordionGroup/_index.scss | 9 ++-- .../src/shared/components/Button/_index.scss | 7 +++- .../src/shared/components/Card/_index.scss | 9 ++-- .../src/shared/components/Chevron/_index.scss | 13 +++--- .../src/shared/components/Date/_index.scss | 15 +++---- .../src/shared/components/Icon/_index.scss | 4 +- .../src/shared/components/Intro/_index.scss | 1 - .../KeyElegibilityCrieriaList/_index.scss | 5 ++- .../components/LifeEventSection/_index.scss | 10 ++--- .../src/shared/components/Modal/_index.scss | 7 ---- .../shared/components/NoticesList/_index.scss | 5 ++- .../components/ObfuscatedLink/_index.scss | 5 ++- .../shared/components/ProcessList/_index.scss | 9 ++-- .../src/shared/components/Radio/_index.scss | 13 +++--- .../components/Results/_index.scss | 5 ++- .../src/shared/components/Select/_index.scss | 9 ++-- .../shared/components/TextInput/_index.scss | 4 +- .../VerifySelectionsView/_index.scss | 5 ++- .../src/shared/styles/breakpoints/_index.scss | 4 +- .../src/shared/styles/mixins/_index.scss | 41 +++++++------------ .../src/shared/styles/sizes/_index.scss | 4 +- .../src/shared/styles/space/_index.scss | 22 +++++----- 23 files changed, 112 insertions(+), 105 deletions(-) diff --git a/benefit-finder/src/shared/components/Accordion/_index.scss b/benefit-finder/src/shared/components/Accordion/_index.scss index 06647772d..dcb2b2dbc 100644 --- a/benefit-finder/src/shared/components/Accordion/_index.scss +++ b/benefit-finder/src/shared/components/Accordion/_index.scss @@ -1,5 +1,6 @@ @use '../../styles/colors/_index.scss' as color; @use '../../styles/mixins/_index.scss' as *; +@use '../../styles/functions/_index.scss' as *; @use '../../styles/space/_index.scss' as space; .bf-usa-accordion { @@ -8,14 +9,14 @@ position: relative; &:not(:focus) { - box-shadow: 0 4px 4px 0 rgb(0 0 0 / 11%); + box-shadow: 0 rem(4px) rem(4px) 0 rgb(0 0 0 / 11%); } svg { position: absolute; top: 0; bottom: 0; - right: 20px; + right: rem(20px); margin: auto 0; } @@ -49,9 +50,9 @@ } .bf-usa-accordion__content { - border-bottom: 1px solid color.$pop-blue; - border-left: 1px solid color.$pop-blue; - border-right: 1px solid color.$pop-blue; + border-bottom: rem(1px) solid color.$pop-blue; + border-left: rem(1px) solid color.$pop-blue; + border-right: rem(1px) solid color.$pop-blue; padding-bottom: space.$space-md; } } diff --git a/benefit-finder/src/shared/components/BenefitAccordionGroup/_index.scss b/benefit-finder/src/shared/components/BenefitAccordionGroup/_index.scss index 339f15305..3c053e279 100644 --- a/benefit-finder/src/shared/components/BenefitAccordionGroup/_index.scss +++ b/benefit-finder/src/shared/components/BenefitAccordionGroup/_index.scss @@ -1,5 +1,6 @@ @use '../../styles/colors/_index.scss' as color; @use '../../styles/mixins/_index.scss' as *; +@use '../../styles/functions/_index.scss' as *; @use '../../styles/space/_index.scss' as space; .bf-usa-accordion-group { @@ -7,14 +8,14 @@ margin-bottom: space.$space-md-plus; .bf-usa-accordion__button { - border-radius: 3px; + border-radius: rem(3px); } .bf-usa-detail-title { @include h6; padding: 0; - margin: 0 0 24px; + margin: 0 0 rem(24px); text-align: left; } @@ -23,11 +24,11 @@ .bf-usa-alert { @include p; - margin: 0 0 24px; + margin: 0 0 rem(24px); } .bf-unmet-criteria-group { - margin: 0 0 24px; + margin: 0 0 rem(24px); .bf-unmet-criteria-title { @include p; diff --git a/benefit-finder/src/shared/components/Button/_index.scss b/benefit-finder/src/shared/components/Button/_index.scss index 16eacfb83..0fbd5f38c 100644 --- a/benefit-finder/src/shared/components/Button/_index.scss +++ b/benefit-finder/src/shared/components/Button/_index.scss @@ -1,11 +1,14 @@ +@use '../../styles/space/_index.scss' as space; +@use '../../styles/functions/_index.scss' as *; + .bf-usa-button--outline { background-color: transparent; - box-shadow: inset 0 0 0 2px #000; + box-shadow: inset 0 0 0 rem(2px) #000; color: #000; } .bf-usa-button--outline:focus { background-color: transparent; - box-shadow: inset 0 0 0 2px #fff; + box-shadow: inset 0 0 0 rem(2px) #fff; color: #000; } diff --git a/benefit-finder/src/shared/components/Card/_index.scss b/benefit-finder/src/shared/components/Card/_index.scss index fce3eb8ec..39f5b1cc8 100644 --- a/benefit-finder/src/shared/components/Card/_index.scss +++ b/benefit-finder/src/shared/components/Card/_index.scss @@ -1,6 +1,7 @@ @use '../../styles/colors/_index.scss' as color; @use '../../styles/space/_index.scss' as space; @use '../../styles/mixins/_index.scss' as *; +@use '../../styles/functions/_index.scss' as *; @use '../../styles/breakpoints/_index.scss' as *; .bf-usa-card--relative-benefit { @@ -8,7 +9,7 @@ .bf-usa-card__container { background-color: color.$sky; - border-radius: 4px; + border-radius: rem(4px); color: color.$officer-navy; height: auto; margin: 0; @@ -23,7 +24,7 @@ } a:active.bf-usa-card__container { - border: 2px solid color.$pop-blue; + border: rem(2px) solid color.$pop-blue; } &.bf-card-icon { @@ -33,8 +34,8 @@ top: 0; bottom: 0; left: space.$space-md; - width: 70px; - height: 70px; + width: rem(70px); + height: rem(70px); padding: space.$space-sm-plus; } diff --git a/benefit-finder/src/shared/components/Chevron/_index.scss b/benefit-finder/src/shared/components/Chevron/_index.scss index 218cc18f9..1e6f7fb34 100644 --- a/benefit-finder/src/shared/components/Chevron/_index.scss +++ b/benefit-finder/src/shared/components/Chevron/_index.scss @@ -1,5 +1,6 @@ @use '../../styles/colors/_index.scss' as color; @use '../../styles/breakpoints/_index.scss' as *; +@use '../../styles/functions/_index.scss' as *; @use '../../styles/space/_index.scss' as space; @use '../../styles/mixins/_index.scss' as *; @@ -10,26 +11,26 @@ h1.bf-chevron-heading { .bf-chevron { position: relative; background-color: color.$officer-navy; - padding: space.$space-xl space.$space-lg 38px; + padding: space.$space-xl space.$space-lg rem(38px); margin: 0 auto; color: color.$white; - margin-bottom: 140px; + margin-bottom: rem(140px); .grid-container { - max-width: 850px; + max-width: rem(850px); } } .bf-chevron-description p { @include p; - line-height: 25.92px; + line-height: rem(25.92px); } .bf-chevron-description p strong { @include important-x-bold; - line-height: 25.92px; + line-height: rem(25.92px); } // triangle down @@ -38,7 +39,7 @@ h1.bf-chevron-heading { position: absolute; top: 100%; left: 0; - border-top: 76px solid color.$officer-navy; + border-top: rem(76px) solid color.$officer-navy; border-left: 50vw solid transparent; border-right: 50vw solid transparent; } diff --git a/benefit-finder/src/shared/components/Date/_index.scss b/benefit-finder/src/shared/components/Date/_index.scss index ce1272439..f7f1e6b87 100644 --- a/benefit-finder/src/shared/components/Date/_index.scss +++ b/benefit-finder/src/shared/components/Date/_index.scss @@ -2,41 +2,42 @@ @use '../../styles/space/index.scss' as space; @use '../../styles/breakpoints/_index.scss' as *; @use '../../styles/mixins/_index.scss' as *; +@use '../../styles/functions/_index.scss' as *; .bf-usa-form-group { width: 100%; } .bf-usa-memorable-date { - max-width: 320px; + max-width: rem(320px); flex-wrap: wrap; } .bf-usa-input { - border-radius: 3px; + border-radius: rem(3px); @include p; &.usa-input--error { - padding: 8px; + padding: rem(8px); height: initial; - border-radius: 3px; + border-radius: rem(3px); border-color: color.$alert-red; } } .bf-usa-form-group--month { - width: 242px; + width: rem(242px); margin-top: space.$space-sm; } .bf-usa-form-group--day { - width: 64px; + width: rem(64px); margin-top: space.$space-sm; } .bf-usa-form-group--year { - width: 95px; + width: rem(95px); margin-top: space.$space-sm; } diff --git a/benefit-finder/src/shared/components/Icon/_index.scss b/benefit-finder/src/shared/components/Icon/_index.scss index ca686352b..ffb526a3b 100644 --- a/benefit-finder/src/shared/components/Icon/_index.scss +++ b/benefit-finder/src/shared/components/Icon/_index.scss @@ -1,9 +1,11 @@ +@use '../../styles/functions/_index.scss' as *; + .bf-carrot-small, .bf-carrot-big { position: absolute; top: 0; bottom: 0; - right: 20px; + right: rem(20px); margin: auto 0; transform: rotate(-90deg); diff --git a/benefit-finder/src/shared/components/Intro/_index.scss b/benefit-finder/src/shared/components/Intro/_index.scss index 83f0dd5c8..cf1d914d3 100644 --- a/benefit-finder/src/shared/components/Intro/_index.scss +++ b/benefit-finder/src/shared/components/Intro/_index.scss @@ -17,7 +17,6 @@ .bf-cta-wrapper button { margin: 0 auto; - width: $button-max-width; } .bf-intro-process-notices { diff --git a/benefit-finder/src/shared/components/KeyElegibilityCrieriaList/_index.scss b/benefit-finder/src/shared/components/KeyElegibilityCrieriaList/_index.scss index e714f2476..5d3f5173f 100644 --- a/benefit-finder/src/shared/components/KeyElegibilityCrieriaList/_index.scss +++ b/benefit-finder/src/shared/components/KeyElegibilityCrieriaList/_index.scss @@ -1,13 +1,14 @@ @use '../../styles/colors/_index.scss' as color; @use '../../styles/space/_index.scss' as space; @use '../../styles/mixins/_index.scss' as *; +@use '../../styles/functions/_index.scss' as *; .bf-key-eligibility-criteria-group { .bf-key-eligibility-criteria-heading { @include important-bold; background-color: color.$marine; - border-radius: 4px 4px 0 0; + border-radius: rem(4px) rem(4px) 0 0; padding: space.$space-md space.$space-lg; margin: 0; color: color.$white; @@ -25,7 +26,7 @@ .bf-key-eligibility-criteria-list-item { margin: 0; padding: space.$space-md space.$space-lg; - border: 0.5px solid color.$pop-blue; + border: rem(0.5px) solid color.$pop-blue; background-color: color.$sky; display: flex; flex-wrap: nowrap; diff --git a/benefit-finder/src/shared/components/LifeEventSection/_index.scss b/benefit-finder/src/shared/components/LifeEventSection/_index.scss index 828f47432..f96c66be6 100644 --- a/benefit-finder/src/shared/components/LifeEventSection/_index.scss +++ b/benefit-finder/src/shared/components/LifeEventSection/_index.scss @@ -3,6 +3,7 @@ @use '../../styles/space/_index.scss' as space; @use '../../styles/sizes/_index.scss' as *; @use '../../styles/mixins/_index.scss' as *; +@use '../../styles/functions/_index.scss' as *; .bf-usa-form, .bf-verify-selections-view { @@ -13,8 +14,8 @@ .bf-section-wrapper { background-color: color.$white; - border: 1px solid white; - border-radius: 8px; + border: rem(1px) solid white; + border-radius: rem(8px); button { margin-bottom: space.$space-md; @@ -28,7 +29,7 @@ } .bf-section-info { - margin: 50px 20px; + margin: rem(50px) rem(20px); } .bf-section-nav-btn-group { @@ -38,7 +39,6 @@ button, .bf-usa-modal-group a { - width: $button-max-width; margin-bottom: space.$space-md; } } @@ -57,7 +57,7 @@ padding-right: space.$space-md; padding-bottom: space.$padding-bottom-lg; margin-bottom: space.$space-lg-plus; - border-bottom: 1px solid color.$base-light-grey; + border-bottom: rem(1px) solid color.$base-light-grey; h2.bf-usa-section-heading { @include h1; diff --git a/benefit-finder/src/shared/components/Modal/_index.scss b/benefit-finder/src/shared/components/Modal/_index.scss index 6e9003d1a..dd45c7c0b 100644 --- a/benefit-finder/src/shared/components/Modal/_index.scss +++ b/benefit-finder/src/shared/components/Modal/_index.scss @@ -15,13 +15,6 @@ cursor: pointer; } - .bf-nav-item-one, - .bf-nav-item-two { - &.bf-usa-button { - width: $button-max-width; - } - } - .bf-modal-heading { @include important-bold; diff --git a/benefit-finder/src/shared/components/NoticesList/_index.scss b/benefit-finder/src/shared/components/NoticesList/_index.scss index 7ef4f8bef..87f01582e 100644 --- a/benefit-finder/src/shared/components/NoticesList/_index.scss +++ b/benefit-finder/src/shared/components/NoticesList/_index.scss @@ -2,6 +2,7 @@ @use '../../styles/space/_index.scss' as space; @use '../../styles/mixins/_index.scss' as *; @use '../../styles/breakpoints/_index.scss' as *; +@use '../../styles/functions/_index.scss' as *; .bf-notices-list { margin-top: space.$space-md-plus; @@ -31,7 +32,7 @@ .bf-line-sperator { display: block; - border-top: 2px solid color.$base-light-grey; + border-top: rem(2px) solid color.$base-light-grey; width: 100%; height: 100%; } @@ -63,7 +64,7 @@ .bf-line-sperator--vertical { display: block; - border-left: 2px solid color.$base-light-grey; + border-left: rem(2px) solid color.$base-light-grey; width: 100%; height: 80%; } diff --git a/benefit-finder/src/shared/components/ObfuscatedLink/_index.scss b/benefit-finder/src/shared/components/ObfuscatedLink/_index.scss index eb26cdab9..c1e27768a 100644 --- a/benefit-finder/src/shared/components/ObfuscatedLink/_index.scss +++ b/benefit-finder/src/shared/components/ObfuscatedLink/_index.scss @@ -1,9 +1,10 @@ @use '../../styles/colors/_index.scss' as color; +@use '../../styles/functions/_index.scss' as *; .bf-obfuscated-link { position: relative; - padding-right: 50px; - padding-left: 50px; + padding-right: rem(50px); + padding-left: rem(50px); text-decoration: none; &:visited { diff --git a/benefit-finder/src/shared/components/ProcessList/_index.scss b/benefit-finder/src/shared/components/ProcessList/_index.scss index b662b2d66..8e6a1b05e 100644 --- a/benefit-finder/src/shared/components/ProcessList/_index.scss +++ b/benefit-finder/src/shared/components/ProcessList/_index.scss @@ -1,13 +1,14 @@ @use '../../styles/colors/_index.scss' as color; @use '../../styles/mixins/_index.scss' as *; +@use '../../styles/functions/_index.scss' as *; .bf-usa-process-list { - margin-left: 70px; - margin-right: 18px; + margin-left: rem(70px); + margin-right: rem(18px); } .bf-usa-process-list__item { - min-height: 100px; + min-height: rem(100px); border-left: 0.5rem solid color.$sky; &::before { @@ -17,7 +18,7 @@ } .bf-usa-process-list__item:last-child { - border-left: 0.5rem solid transparent; + border-left: rem(8px) solid transparent; } h3.bf-usa-process-list__heading { diff --git a/benefit-finder/src/shared/components/Radio/_index.scss b/benefit-finder/src/shared/components/Radio/_index.scss index c42df2ced..dc0e6d48b 100644 --- a/benefit-finder/src/shared/components/Radio/_index.scss +++ b/benefit-finder/src/shared/components/Radio/_index.scss @@ -1,5 +1,6 @@ @use '../../styles/colors/_index.scss' as color; @use '../../styles/space/_index.scss' as space; +@use '../../styles/functions/_index.scss' as *; .bf-usa-radio__label { margin-top: space.$space-md; @@ -8,15 +9,15 @@ .bf-usa-radio__input:checked + .bf-usa-radio__label::before { background-color: #005ea2; box-shadow: - 0 0 0 2px #005ea2, - inset 0 0 0 2px white; - outline-offset: 4px; + 0 0 0 rem(2px) #005ea2, + inset 0 0 0 rem(2px) white; + outline-offset: rem(4px); } .bf-usa-radio__input:checked.usa-input--error + .bf-usa-radio__label::before { background-color: #005ea2; box-shadow: - 0 0 0 3px color.$alert-red, - inset 0 0 0 2px white; - outline-offset: 4px; + 0 0 0 rem(3px) color.$alert-red, + inset 0 0 0 rem(2px) white; + outline-offset: rem(4px); } diff --git a/benefit-finder/src/shared/components/ResultsView/components/Results/_index.scss b/benefit-finder/src/shared/components/ResultsView/components/Results/_index.scss index 2615e0e1c..21874ec20 100644 --- a/benefit-finder/src/shared/components/ResultsView/components/Results/_index.scss +++ b/benefit-finder/src/shared/components/ResultsView/components/Results/_index.scss @@ -2,6 +2,7 @@ @use '../../../../styles/breakpoints/_index.scss' as *; @use '../../../../styles/space/_index.scss' as space; @use '../../../../styles/mixins/_index.scss' as *; +@use '../../../../styles/functions/_index.scss' as *; .bf-result-view-details { padding: space.$space-lg; @@ -18,7 +19,7 @@ .bf-result-view-relvant-benefits, .bf-result-view-share-results { padding: space.$space-md 0; - border-bottom: 2px solid color.$base-light-grey; + border-bottom: rem(2px) solid color.$base-light-grey; } .bf-result-view-unmet { @@ -62,6 +63,6 @@ @media (width >= $desktop) { .bf-result-view-details { - padding: space.$space-md-plus 164px; + padding: space.$space-md-plus rem(164px); } } diff --git a/benefit-finder/src/shared/components/Select/_index.scss b/benefit-finder/src/shared/components/Select/_index.scss index 1f4525a62..1e4e72cc1 100644 --- a/benefit-finder/src/shared/components/Select/_index.scss +++ b/benefit-finder/src/shared/components/Select/_index.scss @@ -1,21 +1,22 @@ @use '../../styles/colors/_index.scss' as color; @use '../../styles/mixins/_index.scss' as *; +@use '../../styles/functions/_index.scss' as *; .bf-usa-select { - border-radius: 3px; + border-radius: rem(3px); option { @include p; } &.usa-input--error { - padding: 8px 32px 8px 8px; + padding: rem(8px) rem(32px) rem(8px) rem(8px); height: auto; - border-radius: 3px; + border-radius: rem(3px); border-color: color.$alert-red; &:focus { - outline-offset: 2px; + outline-offset: rem(2px); } } } diff --git a/benefit-finder/src/shared/components/TextInput/_index.scss b/benefit-finder/src/shared/components/TextInput/_index.scss index 8358f381b..0130d1685 100644 --- a/benefit-finder/src/shared/components/TextInput/_index.scss +++ b/benefit-finder/src/shared/components/TextInput/_index.scss @@ -1,3 +1,5 @@ +@use '../../styles/functions/_index.scss' as *; + .bf-usa-input.usa-input--error { - outline-offset: 2px; + outline-offset: rem(2px); } diff --git a/benefit-finder/src/shared/components/VerifySelectionsView/_index.scss b/benefit-finder/src/shared/components/VerifySelectionsView/_index.scss index 5e77a9d89..a8f333a7e 100644 --- a/benefit-finder/src/shared/components/VerifySelectionsView/_index.scss +++ b/benefit-finder/src/shared/components/VerifySelectionsView/_index.scss @@ -1,12 +1,13 @@ @use '../../styles/colors/_index.scss' as color; @use '../../styles/mixins/_index.scss' as *; +@use '../../styles/functions/_index.scss' as *; @use '../../styles/space/_index.scss' as space; .bf-verify-criteria-value { @include h6; margin-bottom: space.$space-lg; - border-bottom: 1px solid color.$base-light-grey; + border-bottom: rem(1px) solid color.$base-light-grey; padding-bottom: space.$padding-bottom-lg; } @@ -19,6 +20,6 @@ .bf-verify-criteria-section-heading { @include h4; - border-bottom: 2px solid color.$marine; + border-bottom: rem(2px) solid color.$marine; padding-bottom: space.$padding-bottom-lg; } diff --git a/benefit-finder/src/shared/styles/breakpoints/_index.scss b/benefit-finder/src/shared/styles/breakpoints/_index.scss index 8ed1c2bcb..72fba38a7 100644 --- a/benefit-finder/src/shared/styles/breakpoints/_index.scss +++ b/benefit-finder/src/shared/styles/breakpoints/_index.scss @@ -1 +1,3 @@ -$desktop: 1049px; +@use '../functions/index.scss' as *; + +$desktop: rem(1049px); diff --git a/benefit-finder/src/shared/styles/mixins/_index.scss b/benefit-finder/src/shared/styles/mixins/_index.scss index 2461b5531..f8e74aac5 100644 --- a/benefit-finder/src/shared/styles/mixins/_index.scss +++ b/benefit-finder/src/shared/styles/mixins/_index.scss @@ -1,109 +1,98 @@ -// USAGov font ratio is based on 16px -// for example h1 @ 2.44rem = 39.04px - -// Our conversions -// 36px = 2.25rem -// 32px = 2rem -// 24px = 1.5rem -// 22px = 1.375rem -// 20px = 1.25rem -// 17px = 1.063rem -// 16px = 1rem -// 15px = 0.938rem +@use '../functions/index.scss' as *; @mixin h0 { font-family: 'Public Sans', sans-serif; - font-size: 2.25rem; + font-size: rem(36px); font-weight: 800; line-height: 100%; } @mixin h1 { font-family: 'Public Sans', sans-serif; - font-size: 2rem; + font-size: rem(32px); font-weight: 800; line-height: 100%; } @mixin h2 { font-family: 'Public Sans', sans-serif; - font-size: 1.5rem; + font-size: rem(24px); font-weight: 800; line-height: 100%; } @mixin h3 { font-family: 'Public Sans', sans-serif; - font-size: 1.375rem; + font-size: rem(22px); font-weight: 700; line-height: 134.09%; } @mixin h4 { font-family: 'Public Sans', sans-serif; - font-size: 1.25rem; + font-size: rem(20px); font-weight: 800; line-height: 114.59%; } @mixin h5 { font-family: 'Public Sans', sans-serif; - font-size: 1.375rem; + font-size: rem(22px); font-weight: 700; line-height: 134.09%; } @mixin h6 { font-family: 'Public Sans', sans-serif; - font-size: 1.25rem; + font-size: rem(20px); font-weight: 700; line-height: 134.09%; } @mixin important-x-bold { font-family: 'Public Sans', sans-serif; - font-size: 1rem; + font-size: rem(16px); font-weight: 800; line-height: 134.09%; } @mixin important-bold { font-family: 'Public Sans', sans-serif; - font-size: 1rem; + font-size: rem(16px); font-weight: 700; line-height: 134.09%; } @mixin p { font-family: 'Public Sans', sans-serif; - font-size: 1rem; + font-size: rem(16px); font-weight: 400; line-height: 18.8px; } @mixin p1 { font-family: 'Public Sans', sans-serif; - font-size: 1rem; + font-size: rem(16px); font-weight: 400; line-height: 18.8px; } @mixin p2 { font-family: 'Public Sans', sans-serif; - font-size: 0.938rem; + font-size: rem(15px); font-weight: 400; line-height: 18.8px; } @mixin p3 { font-family: 'Public Sans', sans-serif; - font-size: 15px; + font-size: rem(15px); font-weight: 200; line-height: 18.8px; } @mixin list-items { - font-size: 1.063rem; + font-size: rem(17px); font-weight: 400; line-height: 26px; } diff --git a/benefit-finder/src/shared/styles/sizes/_index.scss b/benefit-finder/src/shared/styles/sizes/_index.scss index c719c6001..3071a533b 100644 --- a/benefit-finder/src/shared/styles/sizes/_index.scss +++ b/benefit-finder/src/shared/styles/sizes/_index.scss @@ -1 +1,3 @@ -$button-max-width: 248px; +@use '../functions/_index.scss' as *; + +$button-max-width: rem(248px); diff --git a/benefit-finder/src/shared/styles/space/_index.scss b/benefit-finder/src/shared/styles/space/_index.scss index 186deff69..253991103 100644 --- a/benefit-finder/src/shared/styles/space/_index.scss +++ b/benefit-finder/src/shared/styles/space/_index.scss @@ -1,13 +1,15 @@ -$space-xs: 4px; -$space-sm: 8px; -$space-sm-plus: 12px; -$space-md: 16px; -$space-md-gap: 20px; -$space-md-plus: 24px; -$space-lg: 32px; -$space-lg-plus: 40px; -$space-xl: 64px; -$space-xl-plus: 86px; +@use '../functions/index.scss' as *; + +$space-xs: rem(4px); +$space-sm: rem(8px); +$space-sm-plus: rem(12px); +$space-md: rem(16px); +$space-md-gap: rem(20px); +$space-md-plus: rem(24px); +$space-lg: rem(32px); +$space-lg-plus: 4rem (0); +$space-xl: rem(64px); +$space-xl-plus: rem(86px); $padding-bottom-sm: $space-sm; $padding-bottom-md: $space-md; $padding-bottom-md-plus: $space-md-plus; From 140b035e7e527fbf263dc29bceb980225bc22958 Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Fri, 9 Aug 2024 04:42:33 -0400 Subject: [PATCH 041/122] PXBF-1446-updated-button-styles: remove print button stylesheet --- .../PrintButton/__tests__/__snapshots__/index.spec.jsx.snap | 2 +- benefit-finder/src/shared/components/PrintButton/_index.scss | 5 ----- benefit-finder/src/shared/components/PrintButton/index.jsx | 3 +-- 3 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 benefit-finder/src/shared/components/PrintButton/_index.scss diff --git a/benefit-finder/src/shared/components/PrintButton/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/PrintButton/__tests__/__snapshots__/index.spec.jsx.snap index 1d37466f2..34bf783e2 100644 --- a/benefit-finder/src/shared/components/PrintButton/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/PrintButton/__tests__/__snapshots__/index.spec.jsx.snap @@ -3,7 +3,7 @@ exports[`PrintButton > renders a match to the previous snapshot 1`] = ` ) From 93e265d80975591a952e63456bd732b7b6286b44 Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Fri, 9 Aug 2024 04:58:49 -0400 Subject: [PATCH 042/122] PXBF-1446-updated-button-styles: remove border bottom on sections --- .../src/shared/components/LifeEventSection/_index.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/benefit-finder/src/shared/components/LifeEventSection/_index.scss b/benefit-finder/src/shared/components/LifeEventSection/_index.scss index f96c66be6..a46cfc8fa 100644 --- a/benefit-finder/src/shared/components/LifeEventSection/_index.scss +++ b/benefit-finder/src/shared/components/LifeEventSection/_index.scss @@ -57,7 +57,6 @@ padding-right: space.$space-md; padding-bottom: space.$padding-bottom-lg; margin-bottom: space.$space-lg-plus; - border-bottom: rem(1px) solid color.$base-light-grey; h2.bf-usa-section-heading { @include h1; From 7da1fbac31df69f61c2371a783af532ae1ef99e0 Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Fri, 9 Aug 2024 04:59:03 -0400 Subject: [PATCH 043/122] PXBF-1446-updated-button-styles: include hover state with unstyled button --- .../src/shared/components/Button/_index.scss | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/benefit-finder/src/shared/components/Button/_index.scss b/benefit-finder/src/shared/components/Button/_index.scss index 0fbd5f38c..bc016c080 100644 --- a/benefit-finder/src/shared/components/Button/_index.scss +++ b/benefit-finder/src/shared/components/Button/_index.scss @@ -1,14 +1,17 @@ @use '../../styles/space/_index.scss' as space; @use '../../styles/functions/_index.scss' as *; +@use '../../styles/colors/_index.scss' as colors; .bf-usa-button--outline { background-color: transparent; box-shadow: inset 0 0 0 rem(2px) #000; - color: #000; -} + color: colors.$pure-black; -.bf-usa-button--outline:focus { - background-color: transparent; - box-shadow: inset 0 0 0 rem(2px) #fff; - color: #000; + &:focus { + box-shadow: inset 0 0 0 rem(2px) #fff; + } + + &:hover { + background-color: colors.$base-light-grey; + } } From 00fd804c862006fff0649a8ea7de714eb2ec404b Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Fri, 9 Aug 2024 05:12:43 -0400 Subject: [PATCH 044/122] PXBF-1446-updated-button-styles: update modal to rem --- benefit-finder/src/shared/components/Modal/index.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/benefit-finder/src/shared/components/Modal/index.jsx b/benefit-finder/src/shared/components/Modal/index.jsx index 9f624b343..2622cb75c 100644 --- a/benefit-finder/src/shared/components/Modal/index.jsx +++ b/benefit-finder/src/shared/components/Modal/index.jsx @@ -25,8 +25,8 @@ const customStyles = { width: '80%', borderRadius: '8px', borderColor: '#005ea2', - padding: '64px 24px', - maxWidth: '520px', + padding: '4rem 1.5rem', + maxWidth: '32.5rem', }, } From bbb9b414825023c5a65e735016666d4f6039a98e Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Fri, 9 Aug 2024 05:13:17 -0400 Subject: [PATCH 045/122] PXBF-1446-updated-button-styles: update spacing between buttons on nav group --- .../src/shared/components/LifeEventSection/_index.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/benefit-finder/src/shared/components/LifeEventSection/_index.scss b/benefit-finder/src/shared/components/LifeEventSection/_index.scss index a46cfc8fa..32eb8c9f4 100644 --- a/benefit-finder/src/shared/components/LifeEventSection/_index.scss +++ b/benefit-finder/src/shared/components/LifeEventSection/_index.scss @@ -14,7 +14,7 @@ .bf-section-wrapper { background-color: color.$white; - border: rem(1px) solid white; + border: rem(1px) solid color.$white; border-radius: rem(8px); button { @@ -37,6 +37,10 @@ flex-wrap: wrap; justify-content: center; + .bf-usa-button:first-of-type { + margin-right: space.$space-lg-plus; + } + button, .bf-usa-modal-group a { margin-bottom: space.$space-md; From e9c720237d9cb7729a4a65d2cba0c759ffa5cffa Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Fri, 9 Aug 2024 05:13:27 -0400 Subject: [PATCH 046/122] PXBF-1446-updated-button-styles: fix rem function wrap --- benefit-finder/src/shared/styles/space/_index.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benefit-finder/src/shared/styles/space/_index.scss b/benefit-finder/src/shared/styles/space/_index.scss index 253991103..71ab3bcb6 100644 --- a/benefit-finder/src/shared/styles/space/_index.scss +++ b/benefit-finder/src/shared/styles/space/_index.scss @@ -7,7 +7,7 @@ $space-md: rem(16px); $space-md-gap: rem(20px); $space-md-plus: rem(24px); $space-lg: rem(32px); -$space-lg-plus: 4rem (0); +$space-lg-plus: rem(40px); $space-xl: rem(64px); $space-xl-plus: rem(86px); $padding-bottom-sm: $space-sm; From 7aacb6bae4982a0e65af223d429614e5de0d936f Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Fri, 9 Aug 2024 05:18:17 -0400 Subject: [PATCH 047/122] PXBF-1446-updated-button-styles: adjust light teal color --- benefit-finder/src/shared/styles/colors/_index.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benefit-finder/src/shared/styles/colors/_index.scss b/benefit-finder/src/shared/styles/colors/_index.scss index ae97d359b..9c277a1a5 100644 --- a/benefit-finder/src/shared/styles/colors/_index.scss +++ b/benefit-finder/src/shared/styles/colors/_index.scss @@ -10,7 +10,7 @@ $medium-grey: #979797; $dark-medium-grey: #3d4551; $base-grey: #dcdee0; $base-light-grey: #f0f0f0; -$light-teal: #e7f6f8; +$light-teal: #d2ebf1; $pure-black: #000; $electric-blue: #0050d8; $teal: #00bde3; From ec447b77dfe44a74267ade24fdedce40379bb58e Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Fri, 9 Aug 2024 05:21:04 -0400 Subject: [PATCH 048/122] PXBF-1446-updated-button-styles: update step back link to outline button --- .../__tests__/__snapshots__/index.spec.jsx.snap | 2 +- .../ResultsView/__tests__/__snapshots__/index.spec.jsx.snap | 4 ++-- .../StepBackLink/__tests__/__snapshots__/index.spec.jsx.snap | 2 +- benefit-finder/src/shared/components/StepBackLink/index.jsx | 2 +- .../StepIndicator/__tests__/__snapshots__/index.spec.jsx.snap | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/benefit-finder/src/shared/components/LifeEventSection/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/LifeEventSection/__tests__/__snapshots__/index.spec.jsx.snap index f7402a73c..d7a311e83 100644 --- a/benefit-finder/src/shared/components/LifeEventSection/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/LifeEventSection/__tests__/__snapshots__/index.spec.jsx.snap @@ -58,7 +58,7 @@ exports[`LifeEventSection > renders a match to the previous snapshot 1`] = `
    ) diff --git a/benefit-finder/src/shared/components/StepIndicator/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/StepIndicator/__tests__/__snapshots__/index.spec.jsx.snap index 05002a4f6..ecd89d0b7 100644 --- a/benefit-finder/src/shared/components/StepIndicator/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/StepIndicator/__tests__/__snapshots__/index.spec.jsx.snap @@ -4,7 +4,7 @@ exports[`StepIndicator > renders a match to the previous snapshot 1`] = `
    +
    + +
    ) } From aac776b719756359f242567e4fea42180b263fda Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Fri, 9 Aug 2024 05:37:55 -0400 Subject: [PATCH 050/122] PXBF-1446-updated-button-styles: remove button styles and flex cta wrapper --- .../ResultsView/components/Results/_index.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/benefit-finder/src/shared/components/ResultsView/components/Results/_index.scss b/benefit-finder/src/shared/components/ResultsView/components/Results/_index.scss index 21874ec20..a311fc4ee 100644 --- a/benefit-finder/src/shared/components/ResultsView/components/Results/_index.scss +++ b/benefit-finder/src/shared/components/ResultsView/components/Results/_index.scss @@ -23,14 +23,14 @@ } .bf-result-view-unmet { - button { - margin-bottom: space.$space-md; - width: 100%; - } - p { padding-bottom: space.$padding-bottom-md; } + + .bf-result-view-cta-wrapper { + display: flex; + justify-content: center; + } } .bf-result-view-unmet-heading { From b5940f9441bb223ca85040fa938c7fac58c9e76b Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Fri, 9 Aug 2024 05:38:19 -0400 Subject: [PATCH 051/122] PXBF-1446-updated-button-styles: remove padding from hidden dom elements --- benefit-finder/src/shared/components/Fieldset/_index.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/benefit-finder/src/shared/components/Fieldset/_index.scss b/benefit-finder/src/shared/components/Fieldset/_index.scss index 8280250f4..25b032128 100644 --- a/benefit-finder/src/shared/components/Fieldset/_index.scss +++ b/benefit-finder/src/shared/components/Fieldset/_index.scss @@ -26,3 +26,8 @@ .bf-fieldset-wrapper:has(fieldset.usa-input--error) { border-left: 0.25rem solid #c61f0c; } + +// we check to see if any of the fieldsets in the wrapper have the error +.bf-fieldset-wrapper:has(fieldset.display-none) { + padding: 0; +} From 0f06469366a46e6de6c765e4dae98a538d27b69f Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Fri, 9 Aug 2024 05:38:47 -0400 Subject: [PATCH 052/122] PXBF-1446-updated-button-styles: remove button styles --- .../src/shared/components/LifeEventSection/_index.scss | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/benefit-finder/src/shared/components/LifeEventSection/_index.scss b/benefit-finder/src/shared/components/LifeEventSection/_index.scss index 32eb8c9f4..e4242852a 100644 --- a/benefit-finder/src/shared/components/LifeEventSection/_index.scss +++ b/benefit-finder/src/shared/components/LifeEventSection/_index.scss @@ -17,15 +17,9 @@ border: rem(1px) solid color.$white; border-radius: rem(8px); - button { + .bf-usa-button { margin-bottom: space.$space-md; } - - button.bf-step-back-link { - color: color.$dark-medium-grey; - background-color: color.$white; - width: auto; - } } .bf-section-info { From 48cc16d9dac3f2eef440394775146c7c2af68333 Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Fri, 9 Aug 2024 06:00:48 -0400 Subject: [PATCH 053/122] PXBF-1446-updated-button-styles: hide display none elements --- benefit-finder/src/shared/components/Fieldset/index.jsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/benefit-finder/src/shared/components/Fieldset/index.jsx b/benefit-finder/src/shared/components/Fieldset/index.jsx index 715dfb5ce..2189d1316 100644 --- a/benefit-finder/src/shared/components/Fieldset/index.jsx +++ b/benefit-finder/src/shared/components/Fieldset/index.jsx @@ -78,6 +78,8 @@ const Fieldset = ({ required={required === true} id={id} data-errormessage={handleErrorMessage} + hidden={hidden} + aria-hidden={hidden} > {legend && handleRequired} {invalid === true && ( From 6433e8fbb8e01301691dbac9f3b9d938db9f4834 Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Fri, 9 Aug 2024 06:01:05 -0400 Subject: [PATCH 054/122] PXBF-1446-updated-button-styles: updated snaps --- .../__snapshots__/index.spec.jsx.snap | 28 ++++++++++++------- .../__snapshots__/index.spec.jsx.snap | 28 ++++++++++++------- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap index 9be8dddc6..588336c41 100644 --- a/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap @@ -6709,12 +6709,16 @@ exports[`loads window query scenario 1 1`] = `

    - + +

    - + +

    - + +

    - + +
    Date: Fri, 9 Aug 2024 06:14:50 -0400 Subject: [PATCH 055/122] PXBF-1446-updated-button-styles: wrap and center accordion group buttons --- .../BenefitAccordionGroup/_index.scss | 12 ++++++-- .../BenefitAccordionGroup/index.jsx | 28 ++++++++++--------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/benefit-finder/src/shared/components/BenefitAccordionGroup/_index.scss b/benefit-finder/src/shared/components/BenefitAccordionGroup/_index.scss index 3c053e279..cafb32ac2 100644 --- a/benefit-finder/src/shared/components/BenefitAccordionGroup/_index.scss +++ b/benefit-finder/src/shared/components/BenefitAccordionGroup/_index.scss @@ -39,9 +39,15 @@ } } - .bf-usa-link { - width: 100%; - margin-bottom: space.$space-lg; + .bf-usa-accordion__content { + .bf-usa-accordion-group-cta-wrapper { + display: flex; + justify-content: center; + + .bf-usa-link { + margin-bottom: space.$space-lg; + } + } } } diff --git a/benefit-finder/src/shared/components/BenefitAccordionGroup/index.jsx b/benefit-finder/src/shared/components/BenefitAccordionGroup/index.jsx index 6f0d58bc3..545c2d967 100644 --- a/benefit-finder/src/shared/components/BenefitAccordionGroup/index.jsx +++ b/benefit-finder/src/shared/components/BenefitAccordionGroup/index.jsx @@ -239,19 +239,21 @@ const BenefitAccordionGroup = ({ {moreInformationNeeded.length > 0 && ( )} - handleBenefitLinkClick(title)} - data-testid="bf-benefit-link" - > - {visitLabel} {agency.title}{' '} - {sourceIsEnglish && SourceIsEnglish === true - ? sourceIsEnglish - : ''} - +
    + handleBenefitLinkClick(title)} + data-testid="bf-benefit-link" + > + {visitLabel} {agency.title}{' '} + {sourceIsEnglish && SourceIsEnglish === true + ? sourceIsEnglish + : ''} + +
    ) })} From 45f9dd122c8e52588e1236276ac5a0ca22f25fee Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Fri, 9 Aug 2024 06:15:02 -0400 Subject: [PATCH 056/122] PXBF-1446-updated-button-styles: updated snaps --- .../__snapshots__/index.spec.jsx.snap | 4082 +++++++++-------- .../__snapshots__/index.spec.jsx.snap | 58 +- .../__snapshots__/index.spec.jsx.snap | 4082 +++++++++-------- 3 files changed, 4353 insertions(+), 3869 deletions(-) diff --git a/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap index 588336c41..95b2875f8 100644 --- a/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap @@ -630,39 +630,43 @@ exports[`loads window query scenario 1 1`] = `
    - - Visit - - Federal Emergency Management Agency (FEMA) - - - + + Visit + + Federal Emergency Management Agency (FEMA) + + + + @@ -806,39 +810,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Department of Labor (DOL) - - - + + Visit + + Department of Labor (DOL) + + + + @@ -1005,39 +1013,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -1239,39 +1251,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -1463,39 +1479,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -1667,39 +1687,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -1866,39 +1890,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -2065,39 +2093,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -2259,39 +2291,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -2458,39 +2494,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -2687,39 +2727,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -2886,39 +2930,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Department of Defense (DOD) - - - + + Visit + + Department of Defense (DOD) + + + + @@ -3122,39 +3170,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -3267,39 +3319,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Department of Interior (DOI) - Indian Affairs - - - + + Visit + + Department of Interior (DOI) - Indian Affairs + + + + @@ -3514,39 +3570,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -3713,39 +3773,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Department of Defense (DOD) - - - + + Visit + + Department of Defense (DOD) + + + + @@ -3912,39 +3976,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -4128,39 +4196,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -4405,39 +4477,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -4581,39 +4657,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Department of Justice (DOJ) - - - + + Visit + + Department of Justice (DOJ) + + + + @@ -4757,39 +4837,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Department of Justice (DOJ) - - - + + Visit + + Department of Justice (DOJ) + + + + @@ -4951,39 +5035,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -5180,39 +5268,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -5396,39 +5488,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -5595,39 +5691,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Department of Defense (DOD) - - - + + Visit + + Department of Defense (DOD) + + + + @@ -5763,39 +5863,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -5962,39 +6066,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Department of Defense (DOD) - - - + + Visit + + Department of Defense (DOD) + + + + @@ -6140,39 +6248,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -6376,39 +6488,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -6653,39 +6769,43 @@ exports[`loads window query scenario 1 1`] = ` - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -7317,39 +7437,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Federal Emergency Management Agency (FEMA) - - - + + Visit + + Federal Emergency Management Agency (FEMA) + + + + @@ -7504,39 +7628,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Department of Labor (DOL) - - - +
    + + Visit + + Department of Labor (DOL) + + + +
    @@ -7703,39 +7831,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -7962,39 +8094,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -8186,39 +8322,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -8390,39 +8530,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -8589,39 +8733,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -8788,39 +8936,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -8982,39 +9134,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -9181,39 +9337,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -9410,39 +9570,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -9609,39 +9773,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Department of Defense (DOD) - - - + + Visit + + Department of Defense (DOD) + + + + @@ -9856,39 +10024,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -10013,39 +10185,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Department of Interior (DOI) - Indian Affairs - - - + + Visit + + Department of Interior (DOI) - Indian Affairs + + + + @@ -10260,39 +10436,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -10459,39 +10639,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Department of Defense (DOD) - - - + + Visit + + Department of Defense (DOD) + + + + @@ -10658,39 +10842,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -10874,39 +11062,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -11140,39 +11332,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -11316,39 +11512,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Department of Justice (DOJ) - - - + + Visit + + Department of Justice (DOJ) + + + + @@ -11492,39 +11692,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Department of Justice (DOJ) - - - + + Visit + + Department of Justice (DOJ) + + + + @@ -11686,39 +11890,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -11915,39 +12123,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -12131,39 +12343,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -12330,39 +12546,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Department of Defense (DOD) - - - + + Visit + + Department of Defense (DOD) + + + + @@ -12498,39 +12718,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -12697,39 +12921,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Department of Defense (DOD) - - - + + Visit + + Department of Defense (DOD) + + + + @@ -12875,39 +13103,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -13086,39 +13318,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -13352,39 +13588,43 @@ exports[`loads window query scenario 2 1`] = ` - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + diff --git a/benefit-finder/src/shared/components/BenefitAccordionGroup/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/BenefitAccordionGroup/__tests__/__snapshots__/index.spec.jsx.snap index f75c4bf7d..e18129728 100644 --- a/benefit-finder/src/shared/components/BenefitAccordionGroup/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/BenefitAccordionGroup/__tests__/__snapshots__/index.spec.jsx.snap @@ -133,36 +133,40 @@ exports[`BenefitAccordionGroup > renders a match to the previous snapshot 1`] = - - Visit Federal Emergency Management Agency (FEMA) - - + + + + + + + diff --git a/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap index 8a1a92900..15abc6f2c 100644 --- a/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/ResultsView/__tests__/__snapshots__/index.spec.jsx.snap @@ -369,39 +369,43 @@ exports[`loads view 1`] = ` - - Visit - - Federal Emergency Management Agency (FEMA) - - - +
    + + Visit + + Federal Emergency Management Agency (FEMA) + + + +
    @@ -545,39 +549,43 @@ exports[`loads view 1`] = ` - - Visit - - Department of Labor (DOL) - - - + + Visit + + Department of Labor (DOL) + + + + @@ -744,39 +752,43 @@ exports[`loads view 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -1003,39 +1015,43 @@ exports[`loads view 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -1227,39 +1243,43 @@ exports[`loads view 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -1431,39 +1451,43 @@ exports[`loads view 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -1630,39 +1654,43 @@ exports[`loads view 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -1829,39 +1857,43 @@ exports[`loads view 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -2023,39 +2055,43 @@ exports[`loads view 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -2222,39 +2258,43 @@ exports[`loads view 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -2451,39 +2491,43 @@ exports[`loads view 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -2650,39 +2694,43 @@ exports[`loads view 1`] = ` - - Visit - - Department of Defense (DOD) - - - + + Visit + + Department of Defense (DOD) + + + + @@ -2897,39 +2945,43 @@ exports[`loads view 1`] = ` - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -3042,39 +3094,43 @@ exports[`loads view 1`] = ` - - Visit - - Department of Interior (DOI) - Indian Affairs - - - + + Visit + + Department of Interior (DOI) - Indian Affairs + + + + @@ -3289,39 +3345,43 @@ exports[`loads view 1`] = ` - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -3488,39 +3548,43 @@ exports[`loads view 1`] = ` - - Visit - - Department of Defense (DOD) - - - + + Visit + + Department of Defense (DOD) + + + + @@ -3687,39 +3751,43 @@ exports[`loads view 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -3903,39 +3971,43 @@ exports[`loads view 1`] = ` - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -4180,39 +4252,43 @@ exports[`loads view 1`] = ` - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -4356,39 +4432,43 @@ exports[`loads view 1`] = ` - - Visit - - Department of Justice (DOJ) - - - + + Visit + + Department of Justice (DOJ) + + + + @@ -4532,39 +4612,43 @@ exports[`loads view 1`] = ` - - Visit - - Department of Justice (DOJ) - - - + + Visit + + Department of Justice (DOJ) + + + + @@ -4726,39 +4810,43 @@ exports[`loads view 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -4955,39 +5043,43 @@ exports[`loads view 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -5171,39 +5263,43 @@ exports[`loads view 1`] = ` - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -5370,39 +5466,43 @@ exports[`loads view 1`] = ` - - Visit - - Department of Defense (DOD) - - - + + Visit + + Department of Defense (DOD) + + + + @@ -5538,39 +5638,43 @@ exports[`loads view 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -5737,39 +5841,43 @@ exports[`loads view 1`] = ` - - Visit - - Department of Defense (DOD) - - - + + Visit + + Department of Defense (DOD) + + + + @@ -5915,39 +6023,43 @@ exports[`loads view 1`] = ` - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -6151,39 +6263,43 @@ exports[`loads view 1`] = ` - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -6428,39 +6544,43 @@ exports[`loads view 1`] = ` - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -6902,39 +7022,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Federal Emergency Management Agency (FEMA) - - - + + Visit + + Federal Emergency Management Agency (FEMA) + + + + @@ -7078,39 +7202,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Department of Labor (DOL) - - - + + Visit + + Department of Labor (DOL) + + + + @@ -7277,39 +7405,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -7536,39 +7668,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -7760,39 +7896,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -7964,39 +8104,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -8163,39 +8307,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -8362,39 +8510,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -8556,39 +8708,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -8755,39 +8911,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -8984,39 +9144,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -9183,39 +9347,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Department of Defense (DOD) - - - + + Visit + + Department of Defense (DOD) + + + + @@ -9430,39 +9598,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -9575,39 +9747,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Department of Interior (DOI) - Indian Affairs - - - + + Visit + + Department of Interior (DOI) - Indian Affairs + + + + @@ -9822,39 +9998,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -10021,39 +10201,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Department of Defense (DOD) - - - + + Visit + + Department of Defense (DOD) + + + + @@ -10220,39 +10404,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -10436,39 +10624,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -10713,39 +10905,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -10889,39 +11085,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Department of Justice (DOJ) - - - + + Visit + + Department of Justice (DOJ) + + + + @@ -11065,39 +11265,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Department of Justice (DOJ) - - - + + Visit + + Department of Justice (DOJ) + + + + @@ -11259,39 +11463,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -11488,39 +11696,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -11704,39 +11916,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -11903,39 +12119,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Department of Defense (DOD) - - - + + Visit + + Department of Defense (DOD) + + + + @@ -12071,39 +12291,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -12270,39 +12494,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Department of Defense (DOD) - - - + + Visit + + Department of Defense (DOD) + + + + @@ -12448,39 +12676,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Veterans Affairs Department (VA) - - - + + Visit + + Veterans Affairs Department (VA) + + + + @@ -12684,39 +12916,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + @@ -12961,39 +13197,43 @@ exports[`scenario 1 loads in view with the correct amount of likely eligible ite - - Visit - - Social Security Administration (SSA) - - - + + Visit + + Social Security Administration (SSA) + + + + From 08c4da7403e65fe9df964cbf057d453dc0d62a3a Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Fri, 9 Aug 2024 06:19:16 -0400 Subject: [PATCH 057/122] PXBF-1446-updated-button-styles: update step back links to outline buttons --- .../components/ResultsView/components/Results/_index.scss | 6 ------ .../components/ResultsView/components/Results/index.jsx | 2 +- .../src/shared/components/StepBackLink/_index.scss | 2 +- .../src/shared/components/StepIndicator/_index.scss | 4 ---- .../src/shared/components/VerifySelectionsView/index.jsx | 2 +- 5 files changed, 3 insertions(+), 13 deletions(-) diff --git a/benefit-finder/src/shared/components/ResultsView/components/Results/_index.scss b/benefit-finder/src/shared/components/ResultsView/components/Results/_index.scss index a311fc4ee..1a14feb70 100644 --- a/benefit-finder/src/shared/components/ResultsView/components/Results/_index.scss +++ b/benefit-finder/src/shared/components/ResultsView/components/Results/_index.scss @@ -6,12 +6,6 @@ .bf-result-view-details { padding: space.$space-lg; - - button.step-back-link { - color: color.$dark-medium-grey; - background-color: color.$white; - width: auto; - } } .bf-result-view-benefits, diff --git a/benefit-finder/src/shared/components/ResultsView/components/Results/index.jsx b/benefit-finder/src/shared/components/ResultsView/components/Results/index.jsx index e1afc7c8e..7e14db780 100644 --- a/benefit-finder/src/shared/components/ResultsView/components/Results/index.jsx +++ b/benefit-finder/src/shared/components/ResultsView/components/Results/index.jsx @@ -86,7 +86,7 @@ const Results = ({ diff --git a/benefit-finder/src/shared/components/StepBackLink/_index.scss b/benefit-finder/src/shared/components/StepBackLink/_index.scss index 038cf122f..eecb022df 100644 --- a/benefit-finder/src/shared/components/StepBackLink/_index.scss +++ b/benefit-finder/src/shared/components/StepBackLink/_index.scss @@ -1,5 +1,5 @@ @use '../../styles/colors/_index.scss' as color; .step-back-link { - color: color.$dark-medium-grey; + // color: color.$dark-medium-grey; } diff --git a/benefit-finder/src/shared/components/StepIndicator/_index.scss b/benefit-finder/src/shared/components/StepIndicator/_index.scss index 638b5a9a3..6b4949922 100644 --- a/benefit-finder/src/shared/components/StepIndicator/_index.scss +++ b/benefit-finder/src/shared/components/StepIndicator/_index.scss @@ -1,10 +1,6 @@ @use '../../styles/colors/_index.scss' as color; @use '../../styles/space/_index.scss' as space; -.step-back-link { - color: color.$dark-medium-grey; -} - .bf-usa-step-indicator__segment-label { color: color.$dark-medium-grey; } diff --git a/benefit-finder/src/shared/components/VerifySelectionsView/index.jsx b/benefit-finder/src/shared/components/VerifySelectionsView/index.jsx index 815e21e3d..eaf42c0b8 100644 --- a/benefit-finder/src/shared/components/VerifySelectionsView/index.jsx +++ b/benefit-finder/src/shared/components/VerifySelectionsView/index.jsx @@ -130,7 +130,7 @@ const VerifySelectionsView = ({ From 0b0b25aa479464027dc235a97d05599c866430f4 Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Fri, 9 Aug 2024 06:35:37 -0400 Subject: [PATCH 058/122] PXBF-1446-updated-button-styles: update from stepbacklink to stepbackbutton --- .../__snapshots__/index.spec.jsx.snap | 2 +- .../components/LifeEventSection/index.jsx | 2 +- .../__snapshots__/index.spec.jsx.snap | 4 ++-- .../__snapshots__/index.spec.jsx.snap | 2 +- .../ResultsView/components/Results/index.jsx | 20 ++++++++++--------- .../__snapshots__/index.spec.jsx.snap | 12 +++++++++++ .../__tests__/index.spec.jsx | 6 +++--- .../_index.scss | 0 .../index.jsx | 8 ++++---- .../index.stories.jsx | 4 ++-- .../__snapshots__/index.spec.jsx.snap | 12 ----------- .../__snapshots__/index.spec.jsx.snap | 2 +- .../shared/components/StepIndicator/index.jsx | 6 +++--- .../__snapshots__/index.spec.jsx.snap | 2 +- .../components/VerifySelectionsView/index.jsx | 4 ++-- benefit-finder/src/shared/components/index.js | 2 +- benefit-finder/src/shared/locales/en/en.json | 4 ++-- benefit-finder/src/shared/locales/es/es.json | 4 ++-- 18 files changed, 49 insertions(+), 47 deletions(-) create mode 100644 benefit-finder/src/shared/components/StepBackButton/__tests__/__snapshots__/index.spec.jsx.snap rename benefit-finder/src/shared/components/{StepBackLink => StepBackButton}/__tests__/index.spec.jsx (54%) rename benefit-finder/src/shared/components/{StepBackLink => StepBackButton}/_index.scss (100%) rename benefit-finder/src/shared/components/{StepBackLink => StepBackButton}/index.jsx (79%) rename benefit-finder/src/shared/components/{StepBackLink => StepBackButton}/index.stories.jsx (77%) delete mode 100644 benefit-finder/src/shared/components/StepBackLink/__tests__/__snapshots__/index.spec.jsx.snap diff --git a/benefit-finder/src/shared/components/LifeEventSection/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/LifeEventSection/__tests__/__snapshots__/index.spec.jsx.snap index d7a311e83..4e926d69d 100644 --- a/benefit-finder/src/shared/components/LifeEventSection/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/LifeEventSection/__tests__/__snapshots__/index.spec.jsx.snap @@ -58,7 +58,7 @@ exports[`LifeEventSection > renders a match to the previous snapshot 1`] = ` ) } @@ -200,7 +202,7 @@ const Results = ({ />
    - renders a match to the previous snapshot 1`] = ` + + + +`; diff --git a/benefit-finder/src/shared/components/StepBackLink/__tests__/index.spec.jsx b/benefit-finder/src/shared/components/StepBackButton/__tests__/index.spec.jsx similarity index 54% rename from benefit-finder/src/shared/components/StepBackLink/__tests__/index.spec.jsx rename to benefit-finder/src/shared/components/StepBackButton/__tests__/index.spec.jsx index 8a18ebd15..7d69a8b4b 100644 --- a/benefit-finder/src/shared/components/StepBackLink/__tests__/index.spec.jsx +++ b/benefit-finder/src/shared/components/StepBackButton/__tests__/index.spec.jsx @@ -1,9 +1,9 @@ import { render } from '@testing-library/react' -import StepBackLink from '../index.jsx' +import StepBackButton from '../index.jsx' -describe('StepBackLink', () => { +describe('StepBackButton', () => { it('renders a match to the previous snapshot', () => { - const { asFragment } = render() + const { asFragment } = render() expect(asFragment()).toMatchSnapshot() }) }) diff --git a/benefit-finder/src/shared/components/StepBackLink/_index.scss b/benefit-finder/src/shared/components/StepBackButton/_index.scss similarity index 100% rename from benefit-finder/src/shared/components/StepBackLink/_index.scss rename to benefit-finder/src/shared/components/StepBackButton/_index.scss diff --git a/benefit-finder/src/shared/components/StepBackLink/index.jsx b/benefit-finder/src/shared/components/StepBackButton/index.jsx similarity index 79% rename from benefit-finder/src/shared/components/StepBackLink/index.jsx rename to benefit-finder/src/shared/components/StepBackButton/index.jsx index 41b74223e..31d449338 100644 --- a/benefit-finder/src/shared/components/StepBackLink/index.jsx +++ b/benefit-finder/src/shared/components/StepBackButton/index.jsx @@ -11,7 +11,7 @@ import './_index.scss' * @param {number} currentIndex - inherited current index state * @return {html} returns markup for a usa unstyled button */ -const StepBackLink = ({ children, setCurrent, currentIndex }) => { +const StepBackButton = ({ children, setCurrent, currentIndex }) => { const resetElement = useResetElement() const handleStep = () => { @@ -20,16 +20,16 @@ const StepBackLink = ({ children, setCurrent, currentIndex }) => { } return ( - ) } -StepBackLink.propTypes = { +StepBackButton.propTypes = { children: PropTypes.node, setCurrent: PropTypes.func, currentIndex: PropTypes.number, } -export default StepBackLink +export default StepBackButton diff --git a/benefit-finder/src/shared/components/StepBackLink/index.stories.jsx b/benefit-finder/src/shared/components/StepBackButton/index.stories.jsx similarity index 77% rename from benefit-finder/src/shared/components/StepBackLink/index.stories.jsx rename to benefit-finder/src/shared/components/StepBackButton/index.stories.jsx index 401cd8596..0d7856263 100644 --- a/benefit-finder/src/shared/components/StepBackLink/index.stories.jsx +++ b/benefit-finder/src/shared/components/StepBackButton/index.stories.jsx @@ -1,7 +1,7 @@ -import StepBackLink from './index.jsx' +import StepBackButton from './index.jsx' export default { - component: StepBackLink, + component: StepBackButton, tags: ['autodocs'], args: { setCurrent: currentIndex => diff --git a/benefit-finder/src/shared/components/StepBackLink/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/StepBackLink/__tests__/__snapshots__/index.spec.jsx.snap deleted file mode 100644 index ed7aee9dd..000000000 --- a/benefit-finder/src/shared/components/StepBackLink/__tests__/__snapshots__/index.spec.jsx.snap +++ /dev/null @@ -1,12 +0,0 @@ -// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html - -exports[`StepBackLink > renders a match to the previous snapshot 1`] = ` - - - -`; diff --git a/benefit-finder/src/shared/components/StepIndicator/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/StepIndicator/__tests__/__snapshots__/index.spec.jsx.snap index ecd89d0b7..46de17d9c 100644 --- a/benefit-finder/src/shared/components/StepIndicator/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/StepIndicator/__tests__/__snapshots__/index.spec.jsx.snap @@ -4,7 +4,7 @@ exports[`StepIndicator > renders a match to the previous snapshot 1`] = `
    )} - + {backLinkLabel} - +
    ) } diff --git a/benefit-finder/src/shared/components/VerifySelectionsView/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/VerifySelectionsView/__tests__/__snapshots__/index.spec.jsx.snap index 805872e8f..cbca0933e 100644 --- a/benefit-finder/src/shared/components/VerifySelectionsView/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/VerifySelectionsView/__tests__/__snapshots__/index.spec.jsx.snap @@ -21,7 +21,7 @@ exports[`VerifySelectionsView > renders a match to the previous snapshot 1`] = ` class="bf-section-info" >
    {data && diff --git a/benefit-finder/src/shared/components/index.js b/benefit-finder/src/shared/components/index.js index c93c0d14a..5d5bc012f 100644 --- a/benefit-finder/src/shared/components/index.js +++ b/benefit-finder/src/shared/components/index.js @@ -30,7 +30,7 @@ export { default as RelativeBenefitList } from './RelativeBenefitList' export { default as ResultsView } from './ResultsView' export { default as ShareTrigger } from './ShareTrigger' export { default as StepIndicator } from './StepIndicator' -export { default as StepBackLink } from './StepBackLink' +export { default as StepBackButton } from './StepBackButton' export { default as Select } from './Select' export { default as Summary } from './Summary' export { default as TextInput } from './TextInput' diff --git a/benefit-finder/src/shared/locales/en/en.json b/benefit-finder/src/shared/locales/en/en.json index 2e2d22270..7ca530600 100644 --- a/benefit-finder/src/shared/locales/en/en.json +++ b/benefit-finder/src/shared/locales/en/en.json @@ -33,7 +33,7 @@ "button": "Start" }, "stepIndicator": { - "stepBackLink": "Back" + "stepBackButton": "Back" }, "requiredLabel": { "value": "required" @@ -126,7 +126,7 @@ "description": "Based on your answers you are likely not eligible for benefits. You may become eligible if you enter more information or your situation changes.", "cta": "See all benefits" }, - "stepBackLink": "Back", + "stepBackButton": "Back", "eligibleResults": { "heading": "Results", "description": "You may be eligible for these benefits." diff --git a/benefit-finder/src/shared/locales/es/es.json b/benefit-finder/src/shared/locales/es/es.json index af3e36c82..dd85e11ba 100644 --- a/benefit-finder/src/shared/locales/es/es.json +++ b/benefit-finder/src/shared/locales/es/es.json @@ -33,7 +33,7 @@ "button": "Comenzar" }, "stepIndicator": { - "stepBackLink": "Volver" + "stepBackButton": "Volver" }, "requiredLabel": { "value": "requerido" @@ -126,7 +126,7 @@ "description": "Basado en sus respuestas usted no es elegible para estos beneficios. Podría ser elegible si ingresa más información o si su situación cambia.", "cta": "Ver todos los beneficios" }, - "stepBackLink": "Volver", + "stepBackButton": "Volver", "eligibleResults": { "heading": "Resultados", "description": "Podría calificar para estos beneficios:" From 4dbd1dfbc8950756e385558dab51e2e621dcc8b0 Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Fri, 9 Aug 2024 06:45:03 -0400 Subject: [PATCH 059/122] PXBF-1446-updated-button-styles: update expand all to button --- .../BenefitAccordionGroup/_index.scss | 19 +++++++------------ .../BenefitAccordionGroup/index.jsx | 2 +- .../__snapshots__/index.spec.jsx.snap | 4 ++-- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/benefit-finder/src/shared/components/BenefitAccordionGroup/_index.scss b/benefit-finder/src/shared/components/BenefitAccordionGroup/_index.scss index cafb32ac2..5a87e358d 100644 --- a/benefit-finder/src/shared/components/BenefitAccordionGroup/_index.scss +++ b/benefit-finder/src/shared/components/BenefitAccordionGroup/_index.scss @@ -39,23 +39,18 @@ } } - .bf-usa-accordion__content { - .bf-usa-accordion-group-cta-wrapper { - display: flex; - justify-content: center; - - .bf-usa-link { - margin-bottom: space.$space-lg; - } + .bf-usa-accordion-group-cta-wrapper { + display: flex; + justify-content: center; + + .bf-usa-link { + margin-bottom: space.$space-lg; } } } .bf-expand-all { - @include p; - - background-color: transparent; - color: color.$electric-blue; margin-bottom: space.$space-lg; + margin-top: space.$space-lg; } } diff --git a/benefit-finder/src/shared/components/BenefitAccordionGroup/index.jsx b/benefit-finder/src/shared/components/BenefitAccordionGroup/index.jsx index 545c2d967..9bee31003 100644 --- a/benefit-finder/src/shared/components/BenefitAccordionGroup/index.jsx +++ b/benefit-finder/src/shared/components/BenefitAccordionGroup/index.jsx @@ -95,7 +95,7 @@ const BenefitAccordionGroup = ({
    @@ -7275,12 +7281,12 @@ exports[`loads window query scenario 2 1`] = ` role="heading" > Key eligibility criteria -

    - Met 5 of + - Met 5 of 5 -

    +
      Key eligibility criteria -

      - Met 2 of + - Met 2 of 2 -

      +
        Key eligibility criteria -

        - Met 1 of + - Met 1 of 4 -

        +
          Key eligibility criteria -

          - Met 3 of + - Met 3 of 6 -

          +
            Key eligibility criteria -

            - Met 2 of + - Met 2 of 4 -

            +
              Key eligibility criteria -

              - Met 1 of + - Met 1 of 5 -

              +
                Key eligibility criteria -

                - Met 1 of + - Met 1 of 4 -

                +
                  Key eligibility criteria -

                  - Met 1 of + - Met 1 of 4 -

                  +
                    Key eligibility criteria -

                    - Met 1 of + - Met 1 of 3 -

                    +
                      Key eligibility criteria -

                      - Met 1 of + - Met 1 of 4 -

                      +
                        Key eligibility criteria -

                        - Met 2 of + - Met 2 of 5 -

                        +
                          Key eligibility criteria -

                          - Met 1 of + - Met 1 of 4 -

                          +
                            Key eligibility criteria -

                            - Met 4 of + - Met 4 of 4 -

                            +
                              Key eligibility criteria -

                              - Met 1 of + - Met 1 of 1 -

                              +
                                Key eligibility criteria -

                                - Met 4 of + - Met 4 of 4 -

                                +
                                  Key eligibility criteria -

                                  - Met 1 of + - Met 1 of 4 -

                                  +
                                    Key eligibility criteria -

                                    - Met 1 of + - Met 1 of 4 -

                                    +
                                      Key eligibility criteria -

                                      - Met 2 of + - Met 2 of 5 -

                                      +
                                        Key eligibility criteria -

                                        - Met 4 of + - Met 4 of 5 -

                                        +
                                          Key eligibility criteria -

                                          - Met 1 of + - Met 1 of 2 -

                                          +
                                            Key eligibility criteria -

                                            - Met 1 of + - Met 1 of 2 -

                                            +
                                              Key eligibility criteria -

                                              - Met 1 of + - Met 1 of 3 -

                                              +
                                                Key eligibility criteria -

                                                - Met 2 of + - Met 2 of 5 -

                                                +
                                                  Key eligibility criteria -

                                                  - Met 2 of + - Met 2 of 5 -

                                                  +
                                                    Key eligibility criteria -

                                                    - Met 1 of + - Met 1 of 4 -

                                                    +
                                                      Key eligibility criteria -

                                                      - Met 0 of + - Met 0 of 3 -

                                                      +
                                                        Key eligibility criteria -

                                                        - Met 1 of + - Met 1 of 4 -

                                                        +
                                                          Key eligibility criteria -

                                                          - Met 0 of + - Met 0 of 5 -

                                                          +
                                                            Key eligibility criteria -

                                                            - Met 2 of + - Met 2 of 4 -

                                                            +
                                                              Key eligibility criteria -

                                                              - Met 4 of + - Met 4 of 5 -

                                                              + diff --git a/benefit-finder/src/shared/components/Accordion/_index.scss b/benefit-finder/src/shared/components/Accordion/_index.scss index dcb2b2dbc..a459310c4 100644 --- a/benefit-finder/src/shared/components/Accordion/_index.scss +++ b/benefit-finder/src/shared/components/Accordion/_index.scss @@ -5,13 +5,8 @@ .bf-usa-accordion { .bf-usa-accordion__button { - padding-bottom: space.$padding-bottom-md-plus; position: relative; - &:not(:focus) { - box-shadow: 0 rem(4px) rem(4px) 0 rgb(0 0 0 / 11%); - } - svg { position: absolute; top: 0; @@ -20,22 +15,6 @@ margin: auto 0; } - &[aria-expanded='true'] { - background-image: none; - background-color: color.$marine; - color: color.$white; - } - - &[aria-expanded='false'] { - background-image: none; - background-color: color.$sky; - color: color.$marine; - - &:hover { - background-color: color.$dark-sky; - } - } - .bf-accordion-heading { @include h6; @@ -43,16 +22,16 @@ } .bf-accordion-sub-heading { - @include p; + @include p1; letter-spacing: 0; } } .bf-usa-accordion__content { - border-bottom: rem(1px) solid color.$pop-blue; - border-left: rem(1px) solid color.$pop-blue; - border-right: rem(1px) solid color.$pop-blue; - padding-bottom: space.$space-md; + border-bottom: rem(2px) solid color.$base-light-grey; + border-left: rem(2px) solid color.$base-light-grey; + border-right: rem(2px) solid color.$base-light-grey; + padding: 0 space.$space-lg-plus space.$space-md space.$space-lg-plus; } } diff --git a/benefit-finder/src/shared/components/BenefitAccordionGroup/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/BenefitAccordionGroup/__tests__/__snapshots__/index.spec.jsx.snap index e18129728..d1efbb8fc 100644 --- a/benefit-finder/src/shared/components/BenefitAccordionGroup/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/BenefitAccordionGroup/__tests__/__snapshots__/index.spec.jsx.snap @@ -84,12 +84,12 @@ exports[`BenefitAccordionGroup > renders a match to the previous snapshot 1`] = role="heading" > Key eligibility criteria -

                                                              - Met 0 of + - Met 0 of 5 -

                                                              +
                                                                renders a match to the previous snapshot 1`] = ` /> diff --git a/benefit-finder/src/shared/components/Icon/index_icons.jsx b/benefit-finder/src/shared/components/Icon/index_icons.jsx index 115829a69..cc3f5965e 100644 --- a/benefit-finder/src/shared/components/Icon/index_icons.jsx +++ b/benefit-finder/src/shared/components/Icon/index_icons.jsx @@ -46,7 +46,7 @@ export const Close = ({ color }) => ( width="24" > - + ) diff --git a/benefit-finder/src/shared/components/KeyElegibilityCrieriaList/_index.scss b/benefit-finder/src/shared/components/KeyElegibilityCrieriaList/_index.scss index 5d3f5173f..a50716012 100644 --- a/benefit-finder/src/shared/components/KeyElegibilityCrieriaList/_index.scss +++ b/benefit-finder/src/shared/components/KeyElegibilityCrieriaList/_index.scss @@ -5,17 +5,15 @@ .bf-key-eligibility-criteria-group { .bf-key-eligibility-criteria-heading { - @include important-bold; + @include h6; - background-color: color.$marine; - border-radius: rem(4px) rem(4px) 0 0; + background-color: color.$base-light-grey; padding: space.$space-md space.$space-lg; margin: 0; - color: color.$white; - text-align: center; } .bf-key-eligibility-criteria-sub-heading { + font-weight: normal; margin-bottom: 0; } @@ -24,10 +22,11 @@ margin: 0; .bf-key-eligibility-criteria-list-item { + @include list-items; + margin: 0; padding: space.$space-md space.$space-lg; - border: rem(0.5px) solid color.$pop-blue; - background-color: color.$sky; + border: rem(2px) solid color.$base-light-grey; display: flex; flex-wrap: nowrap; @@ -38,15 +37,23 @@ } li.bf-usa-list { - @include p2; - } + @include list-items; - li.bf-unmet-criteria-item { - @include p; + line-height: normal; } } } -.bf-usa-alert .bf-usa-alert__text { - @include p3; +.bf-unmet-criteria-group { + padding: space.$space-md-plus 0 0 space.$space-md-plus; + + .bf-unmet-criteria-title { + @include h6; + + margin-bottom: space.$space-sm-plus; + } + + li.bf-unmet-criteria-item { + @include list-items; + } } diff --git a/benefit-finder/src/shared/components/KeyElegibilityCrieriaList/index.jsx b/benefit-finder/src/shared/components/KeyElegibilityCrieriaList/index.jsx index 02d174d46..d6ed41ecc 100644 --- a/benefit-finder/src/shared/components/KeyElegibilityCrieriaList/index.jsx +++ b/benefit-finder/src/shared/components/KeyElegibilityCrieriaList/index.jsx @@ -30,8 +30,8 @@ const KeyElegibilityCrieriaList = ({ headingLevel={5} > {`${benefitSummary}`} -

                                                                {`${benefitSummaryPrefix} ${data.length} ${benefitSummaryConjunction} - ${initialEligibilityLength}`}

                                                                + {` - ${benefitSummaryPrefix} ${data.length} ${benefitSummaryConjunction} + ${initialEligibilityLength}`}
                                                                  {data.map((item, index) => { diff --git a/benefit-finder/src/shared/components/LifeEventSection/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/LifeEventSection/__tests__/__snapshots__/index.spec.jsx.snap index 4e926d69d..e05dd9dd9 100644 --- a/benefit-finder/src/shared/components/LifeEventSection/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/LifeEventSection/__tests__/__snapshots__/index.spec.jsx.snap @@ -58,7 +58,7 @@ exports[`LifeEventSection > renders a match to the previous snapshot 1`] = `
                                                                diff --git a/benefit-finder/src/shared/components/ResultsView/components/Results/_index.scss b/benefit-finder/src/shared/components/ResultsView/components/Results/_index.scss index 1a14feb70..70ee507d5 100644 --- a/benefit-finder/src/shared/components/ResultsView/components/Results/_index.scss +++ b/benefit-finder/src/shared/components/ResultsView/components/Results/_index.scss @@ -29,34 +29,22 @@ .bf-result-view-unmet-heading { @include h4; - - text-align: center; } .bf-result-view-relvant-benefits-heading { @include h4; - - text-align: center; } .bf-result-view-share-results-heading { @include h4; - - text-align: center; } .bf-result-view-share-results { text-align: left; } -.bf-result-view-share-results-button-group { - button { - margin-bottom: space.$space-sm; - } -} - @media (width >= $desktop) { .bf-result-view-details { - padding: space.$space-md-plus rem(164px); + padding: space.$space-md-plus space.$space-xl-plus; } } diff --git a/benefit-finder/src/shared/components/ResultsView/components/Results/index.jsx b/benefit-finder/src/shared/components/ResultsView/components/Results/index.jsx index f0ca84f89..c06747027 100644 --- a/benefit-finder/src/shared/components/ResultsView/components/Results/index.jsx +++ b/benefit-finder/src/shared/components/ResultsView/components/Results/index.jsx @@ -88,7 +88,7 @@ const Results = ({ @@ -127,16 +127,26 @@ const Results = ({ {shareResults?.heading}

                                                                {shareResults?.description}

                                                                -
                                                                - - -
                                                                +
                                                                  +
                                                                • + {' '} + +
                                                                  • +
                                                                • + {' '} + +
                                                                  • +
                                                                ) } diff --git a/benefit-finder/src/shared/components/StepBackButton/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/StepBackButton/__tests__/__snapshots__/index.spec.jsx.snap index 6c44b5bfd..d27c5ea06 100644 --- a/benefit-finder/src/shared/components/StepBackButton/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/StepBackButton/__tests__/__snapshots__/index.spec.jsx.snap @@ -3,7 +3,7 @@ exports[`StepBackButton > renders a match to the previous snapshot 1`] = ` ) diff --git a/benefit-finder/src/shared/components/StepIndicator/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/StepIndicator/__tests__/__snapshots__/index.spec.jsx.snap index 46de17d9c..2399ff22a 100644 --- a/benefit-finder/src/shared/components/StepIndicator/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/StepIndicator/__tests__/__snapshots__/index.spec.jsx.snap @@ -4,7 +4,7 @@ exports[`StepIndicator > renders a match to the previous snapshot 1`] = `
                                                                From b42b9c41be7e05b3f196a50e051bd619c7089ceb Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Tue, 13 Aug 2024 09:54:18 -0400 Subject: [PATCH 064/122] PXBF-1449-updated-accordion-design: remove log --- .../shared/components/ResultsView/components/Results/index.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/benefit-finder/src/shared/components/ResultsView/components/Results/index.jsx b/benefit-finder/src/shared/components/ResultsView/components/Results/index.jsx index c06747027..1e2218427 100644 --- a/benefit-finder/src/shared/components/ResultsView/components/Results/index.jsx +++ b/benefit-finder/src/shared/components/ResultsView/components/Results/index.jsx @@ -74,7 +74,6 @@ const Results = ({ } const ResultsStepBackButton = ({ notEligibleView, handleStepBack, ui }) => { - console.log(ui) const { stepBackButton } = ui return notEligibleView === false ? ( Date: Tue, 13 Aug 2024 10:12:14 -0400 Subject: [PATCH 065/122] PXBF-usagov-theme-conversion: update icons --- .../__snapshots__/index.spec.jsx.snap | 296 ++++++++++++++---- .../src/shared/components/Icon/index.jsx | 6 +- .../shared/components/Icon/index_icons.jsx | 176 ++++++++--- .../__snapshots__/index.spec.jsx.snap | 148 +++++++-- 4 files changed, 487 insertions(+), 139 deletions(-) diff --git a/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap index be0c7e1cb..fdf56e213 100644 --- a/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap @@ -6867,18 +6867,80 @@ exports[`loads window query scenario 1 1`] = ` data-testid="icon-retirement" > + + + + + + + + + + @@ -6946,32 +7008,54 @@ exports[`loads window query scenario 1 1`] = ` > - - - - - - + + + + + + + +
                                                                + + + + + + + + + + @@ -13771,32 +13917,54 @@ exports[`loads window query scenario 2 1`] = ` > - - - - - - + + + + + + + +
                                                                { icon = break case 'death': - icon = + icon = break case 'disability': - icon = + icon = break case 'email': icon = @@ -45,7 +45,7 @@ const Icon = ({ type, color, ...props }) => { icon = break case 'retirement': - icon = + icon = break case 'share': icon = diff --git a/benefit-finder/src/shared/components/Icon/index_icons.jsx b/benefit-finder/src/shared/components/Icon/index_icons.jsx index cc3f5965e..fd26e0543 100644 --- a/benefit-finder/src/shared/components/Icon/index_icons.jsx +++ b/benefit-finder/src/shared/components/Icon/index_icons.jsx @@ -51,19 +51,29 @@ export const Close = ({ color }) => ( ) // death -export const Death = ({ color }) => ( +export const Death = () => ( + ) @@ -87,33 +97,57 @@ export const Email = ({ color }) => ( ) // disability -export const Disability = ({ color }) => ( +export const Disability = () => ( - - - - - - + + + + + + + + ) @@ -187,20 +221,82 @@ export const Open = ({ color }) => ( ) // retirement -export const Retirement = ({ color }) => ( +export const Retirement = () => ( + + + + + + + + + + ) diff --git a/benefit-finder/src/shared/components/RelativeBenefitList/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/shared/components/RelativeBenefitList/__tests__/__snapshots__/index.spec.jsx.snap index 3ec459ef0..d83e1ad44 100644 --- a/benefit-finder/src/shared/components/RelativeBenefitList/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/shared/components/RelativeBenefitList/__tests__/__snapshots__/index.spec.jsx.snap @@ -19,18 +19,80 @@ exports[`RelativeBenefitList > renders a match to the previous snapshot 1`] = ` data-testid="icon-retirement" > + + + + + + + + + + @@ -98,32 +160,54 @@ exports[`RelativeBenefitList > renders a match to the previous snapshot 1`] = ` > - - - - - - + + + + + + + +
                                                                Date: Tue, 13 Aug 2024 10:53:23 -0400 Subject: [PATCH 066/122] PXBF-usagov-theme-conversion: update carrots style --- .../src/shared/components/Icon/index.jsx | 8 +++---- .../shared/components/Icon/index_icons.jsx | 24 +++++++++---------- .../components/ObfuscatedLink/index.jsx | 2 +- .../__tests__/index.spec.jsx | 2 +- .../RelativeBenefitList/index.stories.jsx | 2 +- .../ResultsView/components/Results/index.jsx | 2 +- .../src/shared/style-docs/style-docs.css | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/benefit-finder/src/shared/components/Icon/index.jsx b/benefit-finder/src/shared/components/Icon/index.jsx index 0317e764a..63eab66f7 100644 --- a/benefit-finder/src/shared/components/Icon/index.jsx +++ b/benefit-finder/src/shared/components/Icon/index.jsx @@ -14,11 +14,11 @@ const Icon = ({ type, color, ...props }) => { let icon switch (type) { - case 'carrot-small': - icon = + case 'carrot-solid': + icon = break - case 'carrot-big': - icon = + case 'carrot': + icon = break case 'close': icon = diff --git a/benefit-finder/src/shared/components/Icon/index_icons.jsx b/benefit-finder/src/shared/components/Icon/index_icons.jsx index fd26e0543..3d8b1c0cb 100644 --- a/benefit-finder/src/shared/components/Icon/index_icons.jsx +++ b/benefit-finder/src/shared/components/Icon/index_icons.jsx @@ -2,29 +2,29 @@ import Colors from '../../styles/colors/_index.js' // export svg components in alpha order -// carrot-big -export const CarrotBig = ({ color }) => ( +// carrot +export const Carrot = ({ color }) => ( ) -// carrot-small -export const CarrotSmall = ({ color }) => ( +// carrot-solid +export const CarrotSolid = ({ color }) => ( ( ) export default { - CarrotBig, - CarrotSmall, + Carrot, + CarrotSolid, Close, Death, Disability, diff --git a/benefit-finder/src/shared/components/ObfuscatedLink/index.jsx b/benefit-finder/src/shared/components/ObfuscatedLink/index.jsx index 38c0f63df..bdd1498e5 100644 --- a/benefit-finder/src/shared/components/ObfuscatedLink/index.jsx +++ b/benefit-finder/src/shared/components/ObfuscatedLink/index.jsx @@ -47,7 +47,7 @@ const ObfuscatedLink = ({ const handleCarrot = noCarrot === true ? null : ( - + ) return ( diff --git a/benefit-finder/src/shared/components/RelativeBenefitList/__tests__/index.spec.jsx b/benefit-finder/src/shared/components/RelativeBenefitList/__tests__/index.spec.jsx index e7a43dd72..2830af5b5 100644 --- a/benefit-finder/src/shared/components/RelativeBenefitList/__tests__/index.spec.jsx +++ b/benefit-finder/src/shared/components/RelativeBenefitList/__tests__/index.spec.jsx @@ -6,7 +6,7 @@ const { data } = JSON.parse(content) const relativeBenefits = data.lifeEventForm.relevantBenefits const args = { data: relativeBenefits, - carrotType: 'carrot-big', + carrotType: 'carrot', } describe('RelativeBenefitList', () => { diff --git a/benefit-finder/src/shared/components/RelativeBenefitList/index.stories.jsx b/benefit-finder/src/shared/components/RelativeBenefitList/index.stories.jsx index 1c555442b..f64439209 100644 --- a/benefit-finder/src/shared/components/RelativeBenefitList/index.stories.jsx +++ b/benefit-finder/src/shared/components/RelativeBenefitList/index.stories.jsx @@ -6,7 +6,7 @@ const { data } = JSON.parse(content) export default { component: RelativeBenefitList, tags: ['autodocs'], - args: { data: data.lifeEventForm.relevantBenefits, carrotType: 'carrot-big' }, + args: { data: data.lifeEventForm.relevantBenefits, carrotType: 'carrot' }, } export const Primary = {} diff --git a/benefit-finder/src/shared/components/ResultsView/components/Results/index.jsx b/benefit-finder/src/shared/components/ResultsView/components/Results/index.jsx index 1e2218427..f90891026 100644 --- a/benefit-finder/src/shared/components/ResultsView/components/Results/index.jsx +++ b/benefit-finder/src/shared/components/ResultsView/components/Results/index.jsx @@ -163,7 +163,7 @@ const Results = ({ {relevantBenefits && ( )}
                                                                diff --git a/benefit-finder/src/shared/style-docs/style-docs.css b/benefit-finder/src/shared/style-docs/style-docs.css index 4570edf92..9693df84d 100644 --- a/benefit-finder/src/shared/style-docs/style-docs.css +++ b/benefit-finder/src/shared/style-docs/style-docs.css @@ -3,7 +3,7 @@ height: 24px; } -.docblock-icongallery .bf-carrot-small, -.docblock-icongallery .bf-carrot-big { +.docblock-icongallery .bf-carrot-solid, +.docblock-icongallery .bf-carrot { position: unset; } From 1f7d4b1eff81aaff12de8c31b668f954c1a72ec4 Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Tue, 13 Aug 2024 10:54:06 -0400 Subject: [PATCH 067/122] PXBF-usagov-theme-conversion: adjust relative benefits card styles --- .../src/shared/components/Card/_index.scss | 14 ++++++-------- .../src/shared/components/Icon/_index.scss | 8 ++++---- .../src/shared/styles/colors/_index.scss | 2 ++ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/benefit-finder/src/shared/components/Card/_index.scss b/benefit-finder/src/shared/components/Card/_index.scss index 39f5b1cc8..353e896e0 100644 --- a/benefit-finder/src/shared/components/Card/_index.scss +++ b/benefit-finder/src/shared/components/Card/_index.scss @@ -8,8 +8,8 @@ margin-bottom: space.$space-md; .bf-usa-card__container { - background-color: color.$sky; - border-radius: rem(4px); + border-radius: 0; + border: rem(2px) solid color.$dark-teal; color: color.$officer-navy; height: auto; margin: 0; @@ -20,11 +20,11 @@ } a:hover.bf-usa-card__container { - background-color: color.$dark-sky; + background-color: color.$medium-teal; } a:active.bf-usa-card__container { - border: rem(2px) solid color.$pop-blue; + border: rem(2px) solid color.$dark-teal; } &.bf-card-icon { @@ -44,12 +44,10 @@ } } - .bf-usa-card__header { - padding-bottom: 0; - } - h3.bf-usa-card__heading { @include h6; + + text-decoration: underline; } .bf-usa-card__body { diff --git a/benefit-finder/src/shared/components/Icon/_index.scss b/benefit-finder/src/shared/components/Icon/_index.scss index ffb526a3b..5258b4965 100644 --- a/benefit-finder/src/shared/components/Icon/_index.scss +++ b/benefit-finder/src/shared/components/Icon/_index.scss @@ -1,11 +1,11 @@ @use '../../styles/functions/_index.scss' as *; -.bf-carrot-small, -.bf-carrot-big { +.bf-carrot-solid, +.bf-carrot { position: absolute; top: 0; bottom: 0; - right: rem(20px); + right: rem(50px); margin: auto 0; transform: rotate(-90deg); @@ -14,6 +14,6 @@ } } -.bf-carrot-big { +.bf-carrot { transform: rotate(0deg); } diff --git a/benefit-finder/src/shared/styles/colors/_index.scss b/benefit-finder/src/shared/styles/colors/_index.scss index 9c277a1a5..57422d34e 100644 --- a/benefit-finder/src/shared/styles/colors/_index.scss +++ b/benefit-finder/src/shared/styles/colors/_index.scss @@ -14,5 +14,7 @@ $light-teal: #d2ebf1; $pure-black: #000; $electric-blue: #0050d8; $teal: #00bde3; +$medium-teal: #ccecf2; +$dark-teal: #0081a1; $alert-red: #b50909; $green-check: #009831; From 3ac4f2027862fed90edfbadc8810569666400eb5 Mon Sep 17 00:00:00 2001 From: scottqueen-bixal Date: Tue, 13 Aug 2024 10:54:24 -0400 Subject: [PATCH 068/122] PXBF-usagov-theme-conversion: updated snaps --- .../__snapshots__/index.spec.jsx.snap | 288 +++++++++--------- .../__snapshots__/index.spec.jsx.snap | 4 +- .../__snapshots__/index.spec.jsx.snap | 4 +- .../__snapshots__/index.spec.jsx.snap | 24 +- .../__snapshots__/index.spec.jsx.snap | 240 +++++++-------- 5 files changed, 280 insertions(+), 280 deletions(-) diff --git a/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap b/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap index fdf56e213..4a43376f0 100644 --- a/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap +++ b/benefit-finder/src/App/__tests__/__snapshots__/index.spec.jsx.snap @@ -646,10 +646,10 @@ exports[`loads window query scenario 1 1`] = `