Merge pull request #1712 from GSA/usagov-theme-conversion

Usagov theme conversion
GSA · Aug 20, 2024 · 3520e63 · 3520e63
2 parents c0a6850 + f00dde5
commit 3520e63
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 26 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
@@ -6240,8 +6240,8 @@ exports[`loads window query scenario 1 1`] = `
                       <svg
                         fill="none"
                         height="45"
-                        viewBox="0 0 46 45"
-                        width="46"
+                        viewBox="0 0 45 45"
+                        width="45"
                         xmlns="http://www.w3.org/2000/svg"
                       >
                         <path
@@ -6380,8 +6380,8 @@ exports[`loads window query scenario 1 1`] = `
                       <svg
                         fill="none"
                         height="45"
-                        viewBox="0 0 46 45"
-                        width="46"
+                        viewBox="0 0 45 45"
+                        width="45"
                         xmlns="http://www.w3.org/2000/svg"
                       >
                         <path
@@ -12520,8 +12520,8 @@ exports[`loads window query scenario 2 1`] = `
                       <svg
                         fill="none"
                         height="45"
-                        viewBox="0 0 46 45"
-                        width="46"
+                        viewBox="0 0 45 45"
+                        width="45"
                         xmlns="http://www.w3.org/2000/svg"
                       >
                         <path
@@ -12660,8 +12660,8 @@ exports[`loads window query scenario 2 1`] = `
                       <svg
                         fill="none"
                         height="45"
-                        viewBox="0 0 46 45"
-                        width="46"
+                        viewBox="0 0 45 45"
+                        width="45"
                         xmlns="http://www.w3.org/2000/svg"
                       >
                         <path

diff --git a/benefit-finder/src/shared/components/Accordion/_index.scss b/benefit-finder/src/shared/components/Accordion/_index.scss
@@ -29,9 +29,6 @@
   }
 
   .bf-usa-accordion__content {
-    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/_index.scss b/benefit-finder/src/shared/components/BenefitAccordionGroup/_index.scss
@@ -21,7 +21,7 @@
       margin-top: space.$space-lg;
 
       .bf-usa-link {
-        margin-bottom: space.$space-lg;
+        margin-bottom: space.$space-md;
       }
     }
   }

diff --git a/benefit-finder/src/shared/components/Icon/index_icons.jsx b/benefit-finder/src/shared/components/Icon/index_icons.jsx
@@ -53,9 +53,10 @@ export const Close = ({ color }) => (
 // death
 export const Death = () => (
   <svg
-    width="46"
+    className="bf-death"
+    width="45"
     height="45"
-    viewBox="0 0 46 45"
+    viewBox="0 0 45 45"
     fill="none"
     xmlns="http://www.w3.org/2000/svg"
   >
@@ -71,7 +72,7 @@ export const Death = () => (
       fillRule="evenodd"
       clipRule="evenodd"
       d="M20.1501 6.87479C20.1501 9.34031 18.1533 11.3388 15.6903 11.3388C13.2273 11.3388 11.2309 9.34031 11.2309 6.87479C11.2309 4.40927 13.2273 2.4104 15.6903 2.4104C18.1533 2.4104 20.1501 4.40927 20.1501 6.87479ZM8.94118 13.9881C8.97531 13.7489 9.18017 13.5712 9.42182 13.5712H21.8969C22.0106 13.5712 22.1206 13.6111 22.2079 13.6839L22.6929 14.0884L28.6272 19.0387C28.7145 19.1115 28.8246 19.1514 28.9382 19.1514H37.5777C37.8151 19.1514 38.0177 19.323 38.0566 19.5572L40.1247 31.979C40.1739 32.2749 39.9457 32.5442 39.6458 32.5442H37.3595C37.0914 32.5442 36.874 32.7616 36.874 33.0297V42.1033C36.874 42.3714 36.6567 42.5888 36.3885 42.5888H32.8998C32.6316 42.5888 32.4143 42.3714 32.4143 42.1033V29.6815C32.4143 29.4134 32.6316 29.196 32.8998 29.196H34.0713C34.3713 29.196 34.5995 28.9267 34.5502 28.6307L33.9758 25.1807L33.7429 23.6286C33.7418 23.6213 33.7355 23.6158 33.728 23.6158C33.7206 23.6158 33.7143 23.6105 33.7131 23.6032L33.5969 22.9053C33.5579 22.6712 33.3553 22.4996 33.118 22.4996H25.9029C25.7879 22.4996 25.6767 22.4588 25.589 22.3844L20.5939 18.1504C20.5062 18.076 20.3949 18.0352 20.2799 18.0352H13.6883C13.4389 18.0352 13.23 18.2242 13.2052 18.4725L12.6333 24.1978C12.6047 24.4836 12.8291 24.7316 13.1164 24.7316H14.0905C14.3586 24.7316 14.576 24.949 14.576 25.2171V42.1035C14.576 42.3716 14.3586 42.589 14.0905 42.589H10.6017C10.3336 42.589 10.1162 42.3716 10.1162 42.1035V29.6817C10.1162 29.4135 9.89885 29.1962 9.63071 29.1962H7.33117C7.03575 29.1962 6.80881 28.9346 6.85053 28.6421L8.94118 13.9881ZM21.2653 25.2167C21.2653 24.9486 21.0479 24.7312 20.7798 24.7312H17.291C17.0229 24.7312 16.8055 24.9486 16.8055 25.2167V42.1031C16.8055 42.3712 17.0229 42.5886 17.291 42.5886H20.7798C21.0479 42.5886 21.2653 42.3712 21.2653 42.1031V25.2167ZM25.7247 25.2167C25.7247 24.9486 25.9421 24.7312 26.2102 24.7312H29.699C29.9671 24.7312 30.1845 24.9486 30.1845 25.2167V42.1031C30.1845 42.3712 29.9671 42.5886 29.699 42.5886H26.2102C25.9421 42.5886 25.7247 42.3712 25.7247 42.1031V25.2167ZM35.7589 12.4548C35.7589 14.9203 33.7625 16.9192 31.2995 16.9192C28.8365 16.9192 26.8397 14.9203 26.8397 12.4548C26.8397 9.98928 28.8365 7.99041 31.2995 7.99041C33.7625 7.99041 35.7589 9.98928 35.7589 12.4548Z"
-      fill="#000000"
+      fill="white"
       stroke="#00C1E7"
       strokeWidth="0.571814"
     />
@@ -99,9 +100,9 @@ export const Email = ({ color }) => (
 // disability
 export const Disability = () => (
   <svg
-    width="46"
+    width="45"
     height="45"
-    viewBox="0 0 46 45"
+    viewBox="0 0 45 45"
     fill="none"
     xmlns="http://www.w3.org/2000/svg"
   >
@@ -223,9 +224,9 @@ export const Open = ({ color }) => (
 // retirement
 export const Retirement = () => (
   <svg
-    width="46"
+    width="45"
     height="45"
-    viewBox="0 0 46 45"
+    viewBox="0 0 45 45"
     fill="none"
     xmlns="http://www.w3.org/2000/svg"
   >

diff --git a/benefit-finder/src/shared/components/KeyElegibilityCrieriaList/_index.scss b/benefit-finder/src/shared/components/KeyElegibilityCrieriaList/_index.scss
@@ -27,6 +27,7 @@
       margin: 0;
       padding: space.$space-md space.$space-lg;
       border: rem(2px) solid color.$base-light-grey;
+      border-bottom: 0;
       display: flex;
       flex-wrap: nowrap;
 
@@ -36,6 +37,10 @@
       }
     }
 
+    &:last-child {
+      border-bottom: rem(2px) solid color.$base-light-grey;
+    }
+
     li.bf-usa-list {
       @include list-items;
 

diff --git a/benefit-finder/src/shared/components/Radio/_index.scss b/benefit-finder/src/shared/components/Radio/_index.scss
@@ -7,9 +7,9 @@
 }
 
 .bf-usa-radio__input:checked + .bf-usa-radio__label::before {
-  background-color: #005ea2;
+  background-color: color.$off-black;
   box-shadow:
-    0 0 0 rem(2px) #005ea2,
+    0 0 0 rem(2px) color.$off-black,
     inset 0 0 0 rem(2px) white;
   outline-offset: rem(4px);
 }

diff --git a/...der/src/shared/components/RelativeBenefitList/__tests__/__snapshots__/index.spec.jsx.snap b/...der/src/shared/components/RelativeBenefitList/__tests__/__snapshots__/index.spec.jsx.snap
@@ -21,8 +21,8 @@ exports[`RelativeBenefitList > renders a match to the previous snapshot 1`] = `
           <svg
             fill="none"
             height="45"
-            viewBox="0 0 46 45"
-            width="46"
+            viewBox="0 0 45 45"
+            width="45"
             xmlns="http://www.w3.org/2000/svg"
           >
             <path
@@ -161,8 +161,8 @@ exports[`RelativeBenefitList > renders a match to the previous snapshot 1`] = `
           <svg
             fill="none"
             height="45"
-            viewBox="0 0 46 45"
-            width="46"
+            viewBox="0 0 45 45"
+            width="45"
             xmlns="http://www.w3.org/2000/svg"
           >
             <path

diff --git a/benefit-finder/src/shared/components/ResultsView/components/Results/_index.scss b/benefit-finder/src/shared/components/ResultsView/components/Results/_index.scss
@@ -45,6 +45,6 @@
 
 @media (width >= $desktop) {
   .bf-result-view-details {
-    padding: space.$space-md-plus rem(164px);
+    padding: space.$space-md-plus 5.4rem;
   }
 }