Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

All Branding Changes #760

Merged
merged 248 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from 226 commits
Commits
Show all changes
248 commits
Select commit Hold shift + click to select a range
b28e1c3
Refactored code. Progress bar now is empty on first step of intake.
mexi-cano Nov 20, 2023
6298cd7
Updated progress styling.
mexi-cano Nov 20, 2023
e8c6179
734: Step 1 and step 2
Mdemenko1 Nov 21, 2023
433595d
734: Fixing prettier
Mdemenko1 Nov 21, 2023
341cb39
Prettier changes
mexi-cano Nov 21, 2023
10360db
734: Step 1
Mdemenko1 Nov 22, 2023
5fd3901
734: Step 2 WIP
Mdemenko1 Nov 22, 2023
6ebc943
734/step-2/checkbox update
Mdemenko1 Nov 27, 2023
4a00fbc
prettier applied
Mdemenko1 Nov 27, 2023
09d3a82
Updated typography, added secondary header and placed headers in cont…
mexi-cano Nov 28, 2023
5dbc211
Removed progress bar border.
mexi-cano Nov 28, 2023
fbcd6e0
Removed border shadow
mexi-cano Nov 28, 2023
afa924f
Secondary headings update: wip
Mdemenko1 Nov 29, 2023
fe2716c
wip:clean up
Mdemenko1 Nov 29, 2023
c74e8ae
changes to the PR comments
Mdemenko1 Nov 29, 2023
0a37a9f
734: prettier fix
Mdemenko1 Nov 29, 2023
e68e90f
734: Fixing merge conflict
Mdemenko1 Nov 29, 2023
cf7f6ec
Merge branch 'Marianna/734/typography-updates' into Marianna/734/Step-1
Mdemenko1 Nov 29, 2023
f972210
Merge pull request #761 from Gary-Community-Ventures/Marianna/734/Step-1
Mdemenko1 Nov 29, 2023
4246e4a
734: step 2/removing extra css class
Mdemenko1 Nov 29, 2023
28e508d
Merge branch 'Marianna/734/typography-updates' into Marianna/734/Step-2
Mdemenko1 Nov 29, 2023
2c02827
Reverted nullish coalescing approach.
mexi-cano Nov 29, 2023
6d7153d
float buttons left and right
myang1010 Nov 21, 2023
abc6901
implement new css style
myang1010 Nov 28, 2023
618f2fc
remove some unnecessary html tags
myang1010 Nov 29, 2023
2e2a897
Placed zip code screen header into FormattedMessage
mexi-cano Nov 30, 2023
ad6d2a7
Moved question component colors from style sheet to styleController
mexi-cano Nov 30, 2023
954271e
Prettier changes.
mexi-cano Nov 30, 2023
8c5c6d8
Merge branch 'main' into refactor/step-3-branding-updates
mexi-cano Nov 30, 2023
c58a10b
Merge branch 'main' into refactor/progress-bar-update
mexi-cano Nov 30, 2023
ff14776
add mfb loading git
CalebPena Nov 30, 2023
916fd15
Change householdData var name to memberData
ivonne-hernandez Nov 30, 2023
8c1e6db
Updating logo png
Mdemenko1 Nov 30, 2023
cdecdcc
Additional PR comments
Mdemenko1 Nov 30, 2023
b43f0d8
Adjust bullet points
Mdemenko1 Nov 30, 2023
a175990
apply hover css style to back button
myang1010 Nov 30, 2023
3ec3abb
Merge pull request #762 from Gary-Community-Ventures/Marianna/734/Step-2
Mdemenko1 Dec 1, 2023
5e92ffa
WIP for OptionCardGroup2
ivonne-hernandez Dec 1, 2023
29f7be0
Merge pull request #774 from Gary-Community-Ventures/Marianna/733/upd…
Mdemenko1 Dec 1, 2023
984b91a
use styleControler for continue and css for back button style
myang1010 Dec 2, 2023
6eee184
Replaced globe icon in header. Styling changes for Select. Removed un…
mexi-cano Dec 4, 2023
ae00979
Merge branch 'main' into refactor/language-select-update
mexi-cano Dec 4, 2023
ac9d30d
Update conditionOptions
ivonne-hernandez Dec 5, 2023
ee9145a
Add space
ivonne-hernandez Dec 5, 2023
868b933
Add OptionCardGroup2 component
ivonne-hernandez Dec 5, 2023
504a276
Replace condition ckbox with optionCardGroup
ivonne-hernandez Dec 5, 2023
0afd9e7
Updating and adding colors
Mdemenko1 Dec 5, 2023
2d7da70
Update healthInsuranceOptions
ivonne-hernandez Dec 5, 2023
7cb7935
Add a conditions key to memberData & move conditions inside
ivonne-hernandez Dec 5, 2023
fe3261e
Update update & fetchScreen to acct for new conditions key
ivonne-hernandez Dec 5, 2023
81da90e
Add handleOptionCardClick
ivonne-hernandez Dec 5, 2023
2dc0621
Update createConditionOptionCards
ivonne-hernandez Dec 5, 2023
07c04bb
Add displayHealthCareQuestion
ivonne-hernandez Dec 5, 2023
13b7c51
Add stateVariable prop to OptionCardGroup2
ivonne-hernandez Dec 5, 2023
03fb817
Merge branch 'Marianna/734/typography-updates' into Marianna/765/upda…
Mdemenko1 Dec 5, 2023
ec0f97c
Merge pull request #785 from Gary-Community-Ventures/Marianna/765/upd…
CalebPena Dec 5, 2023
823b6c6
Delete comment from FetchScreen
ivonne-hernandez Dec 5, 2023
0ccdf8c
Add HealthInsuranceError component
ivonne-hernandez Dec 5, 2023
d6a755e
Refactor displayHealthInsQ func to use new comps
ivonne-hernandez Dec 5, 2023
c00f3dd
Delete old OptionCardGroup
ivonne-hernandez Dec 5, 2023
d431beb
Add updated OptionCardGroup component
ivonne-hernandez Dec 5, 2023
973f70b
Update QCC to use new OptionCardGroup
ivonne-hernandez Dec 5, 2023
56fc059
Mv handleOptionCardClick inside OptionCardGroup comp
ivonne-hernandez Dec 5, 2023
d1cc10f
Delete the HealthInsuranceQ comp
ivonne-hernandez Dec 5, 2023
fd073a9
Update conditionOptions with new icons
ivonne-hernandez Dec 5, 2023
d538ff6
Update healthInsuranceOptions with new icons
ivonne-hernandez Dec 5, 2023
f312da5
Update acuteConditionOptions with new icons
ivonne-hernandez Dec 5, 2023
4e75bff
Remove old option card icons
ivonne-hernandez Dec 5, 2023
30ec391
update typography and css background color alternatively
myang1010 Dec 5, 2023
b1142ef
rebrand resultError page
myang1010 Dec 5, 2023
9ed3128
Merge branch 'Marianna/734/typography-updates' into refactor/back-and…
myang1010 Dec 5, 2023
23026cf
add the missing css variable back
myang1010 Dec 5, 2023
6ccd6ea
Merge branch 'Marianna/734/typography-updates' into rebrand/error-res…
myang1010 Dec 5, 2023
00926fc
Merge branch 'Marianna/734/typography-updates' into rebrand/step-6
myang1010 Dec 5, 2023
dc95370
update Add Another Expanse button className
myang1010 Dec 5, 2023
42effdd
Add checkmark to cards
ivonne-hernandez Dec 6, 2023
db2771d
Update card styling
ivonne-hernandez Dec 6, 2023
d550e23
Make the cards a square by X width & height
ivonne-hernandez Dec 6, 2023
2c9f31c
Increase card height for mobile
ivonne-hernandez Dec 6, 2023
cea115f
Remove period from student text
ivonne-hernandez Dec 6, 2023
d848ffe
Merge branch 'Marianna/734/typography-updates' into refactor/language…
mexi-cano Dec 6, 2023
efcb8d0
remove lightLavenderBackground variables and use SecondaryBackgroundC…
myang1010 Dec 6, 2023
b5e90b2
Merge pull request #777 from Gary-Community-Ventures/refactor/languag…
CalebPena Dec 6, 2023
98c0b55
Merge branch 'Marianna/734/typography-updates' into refactor/progress…
mexi-cano Dec 6, 2023
8c372dc
Updated hard coded colors to theme variables.
mexi-cano Dec 6, 2023
cd1c259
Remove padding from CardContent
ivonne-hernandez Dec 6, 2023
e1588e2
Reorder css properties
ivonne-hernandez Dec 6, 2023
0c90970
Align OptionCardGroup container to the center
ivonne-hernandez Dec 6, 2023
5d78f88
switch expense question background color and move style into css class
myang1010 Dec 6, 2023
22ccf5b
Fix box shadow to match figma values
ivonne-hernandez Dec 6, 2023
2f26c80
change input background to white and switch to use rem
myang1010 Dec 6, 2023
5ccf68f
Add padding back in to acct for mobile
ivonne-hernandez Dec 6, 2023
f011d71
remove lightLavenderBackground variables from style controller
myang1010 Dec 6, 2023
486069c
Adjust the checkmark height/width, add query for it
ivonne-hernandez Dec 6, 2023
d71aa30
Fix formatting
ivonne-hernandez Dec 7, 2023
5b6158b
Add hhMemberIndex to displayHealthIns to fix error in Confirmation
ivonne-hernandez Dec 7, 2023
434fa91
Fix displayConditions in Confirmation comp to acct for state X
ivonne-hernandez Dec 7, 2023
5cd75e0
name hoverColor for lavender color in style controller
myang1010 Dec 7, 2023
28921a4
fix format error
myang1010 Dec 7, 2023
de20b44
update css based upon review feedback
myang1010 Dec 7, 2023
ec4265f
Split OptionCardGroupProps into Member & OptionCardGroupProps
ivonne-hernandez Dec 7, 2023
e8089ae
Make OptionCardGroup a JS file
ivonne-hernandez Dec 7, 2023
e448084
Fix TS error in healthInsuranceOptions
ivonne-hernandez Dec 7, 2023
43a3b3d
743: Step 7 font updates
Mdemenko1 Dec 7, 2023
3a42e85
make background go full width
ivonne-hernandez Dec 7, 2023
39898fd
Merge branch 'Marianna/734/typography-updates' of github.com:Gary-Com…
ivonne-hernandez Dec 7, 2023
206dd35
Updated terraCotta color to secondary theme color. Reverted progress …
mexi-cano Dec 7, 2023
66aa0ab
Remove underline, add pink bkg to PersonIncomeBlk
ivonne-hernandez Dec 7, 2023
54cce11
Aligned cell phone input box with email input box.
mexi-cano Dec 8, 2023
dc194d7
Move the pink-background css rules to App.css
ivonne-hernandez Dec 8, 2023
3c772cd
Change the name from pink-bckgrd to section
ivonne-hernandez Dec 8, 2023
9bf22b1
use Box and Stack for extended background color
myang1010 Dec 8, 2023
bb4167b
Wrap els in divs to have button be white
ivonne-hernandez Dec 8, 2023
1035e79
Delete radio-question css rule that was adding extra margin
ivonne-hernandez Dec 8, 2023
78a4262
Add margin-top to add-income-btn
ivonne-hernandez Dec 8, 2023
a0b943a
Make input backgrounds white
ivonne-hernandez Dec 8, 2023
2d96b04
Add font-weight to add another income btn
ivonne-hernandez Dec 8, 2023
7366b5c
Merge pull request #791 from Gary-Community-Ventures/rebrand/error-re…
CalebPena Dec 8, 2023
72473c4
Change MuiRadio color to midBlue
ivonne-hernandez Dec 8, 2023
48f7b25
Merge pull request #759 from Gary-Community-Ventures/refactor/progres…
CalebPena Dec 8, 2023
3644d13
Added new confirmation icons. Added CSS styling for the icons. Create…
mexi-cano Dec 8, 2023
583367b
Add padding to income-stream question
ivonne-hernandez Dec 8, 2023
3e84533
Rp body & html target with root id to fix mobile overflow
ivonne-hernandez Dec 8, 2023
ec5e83c
Merge branch 'Marianna/734/typography-updates' into rebrand/step-6
myang1010 Dec 9, 2023
3ca883e
Replace all png icons with original svg files
ivonne-hernandez Dec 11, 2023
ebd496b
Merge branch 'Marianna/734/typography-updates' into refactor/update_b…
myang1010 Dec 11, 2023
7c65d65
744: Step 8
Mdemenko1 Dec 11, 2023
3f52d2a
Step 7: import fonts update
Mdemenko1 Dec 11, 2023
c1c22e7
Rm orange fill color from checkmark, make it a React comp
ivonne-hernandez Dec 11, 2023
041ca8e
Add optionCardIconFillColor to styleController
ivonne-hernandez Dec 11, 2023
b901e15
Replaced .png icon files for .svg. Removed 'item' attribute from icon…
mexi-cano Dec 12, 2023
1c5bf27
Removed css comments
mexi-cano Dec 12, 2023
dde1b94
Merge branch 'Marianna/734/typography-updates' into refactor/step-3-b…
mexi-cano Dec 12, 2023
c7574c8
Merged in typography feature branch.
mexi-cano Dec 12, 2023
077f8c2
Updated styling references.
mexi-cano Dec 12, 2023
d1e712b
Updated header copy for step 3 and 4.
mexi-cano Dec 12, 2023
e1da70a
Replace cls-1 with cls-checkmark to allow for custom white fill on ch…
ivonne-hernandez Dec 12, 2023
8b89e6a
Remove .cls-1 fill from svgs to allow for dynamic fill color
ivonne-hernandez Dec 12, 2023
50dd350
Make all icons a ReactComponent, change image key to icon
ivonne-hernandez Dec 12, 2023
870e904
Replace img tag with ReactComp icon wrapped in a MUI Box
ivonne-hernandez Dec 12, 2023
f13e2ea
Remove .cls-1 fill from svgs to allow for dynamic fill color
ivonne-hernandez Dec 12, 2023
61b32a4
Make all condition icons a ReactComponent, change image key to icon
ivonne-hernandez Dec 12, 2023
5e2ec50
Refactor css variable names
ivonne-hernandez Dec 12, 2023
1eb0887
Change option card icon fill color var name
ivonne-hernandez Dec 12, 2023
dd57aa0
Remove cls-1 fill from svg to allow for dynamic fill color
ivonne-hernandez Dec 12, 2023
2a9eb2c
Add .food-icon class to svg to allow for dynamic fill on food carton
ivonne-hernandez Dec 12, 2023
1e6c8eb
Make all acuteCond icons a ReactComponent, change image key to icon
ivonne-hernandez Dec 12, 2023
720b49f
Add comment to document how the food-icon css rule works
ivonne-hernandez Dec 12, 2023
e5e7c8f
Merge pull request #798 from Gary-Community-Ventures/Marianna/743/fon…
CalebPena Dec 12, 2023
14a865e
Merge branch 'main' of https://github.com/Gary-Community-Ventures/ben…
CalebPena Dec 12, 2023
95e48f7
Rename follow up question function
ivonne-hernandez Dec 12, 2023
04a510b
Merge branch 'Marianna/734/typography-updates' into Marianna/744/Step-8
Mdemenko1 Dec 12, 2023
7c757bb
Removed .png files. Converted SVGs into react component imports. Upda…
mexi-cano Dec 12, 2023
f31ee0c
Remove SubHeaderWrapper from createIncomeStreamsMenuItems to fix drop…
ivonne-hernandez Dec 12, 2023
9137851
Rm IncomeBlock comp & css file since we only use PersonIncomeBlock
ivonne-hernandez Dec 12, 2023
01f7fca
Rename IncomeBlock css to PersonIncBlck css
ivonne-hernandez Dec 12, 2023
171a222
Add income button hover css var to styleController
ivonne-hernandez Dec 12, 2023
e4982bc
Add secondary-heading class to hhdb subheader, rm wrapper
ivonne-hernandez Dec 12, 2023
66e101d
Delete SubHeaderWrapper since it's just an empty div
ivonne-hernandez Dec 12, 2023
b8c2e5a
Merge branch 'main' into refactor/step-3-branding-updates
mexi-cano Dec 13, 2023
92096a3
merged in main
mexi-cano Dec 13, 2023
d7a2da1
Change comment text
ivonne-hernandez Dec 13, 2023
a147fc5
Add property description to income button hover variable
ivonne-hernandez Dec 13, 2023
9e9f377
Change the data type for setMemberData
ivonne-hernandez Dec 13, 2023
3f9197c
Refactor inline styles
ivonne-hernandez Dec 13, 2023
9a6eeda
Use rem unit instead of pixels
ivonne-hernandez Dec 13, 2023
6c70a03
Added subheader to Question type. Added corresponding subheader to st…
mexi-cano Dec 13, 2023
9bd8540
Rename key to optionKey
ivonne-hernandez Dec 13, 2023
aa47829
Fixed error where div was placed within <p> tag on landing page. Upda…
mexi-cano Dec 13, 2023
83ce0e8
Refactor HHDB condition section spacing
ivonne-hernandez Dec 13, 2023
a083dca
Remove padding from income radio question
ivonne-hernandez Dec 13, 2023
8b8cfc6
Reorder css class for consistency
ivonne-hernandez Dec 13, 2023
a362023
Add hexcode for selectfield background color
ivonne-hernandez Dec 13, 2023
96f696c
Add white hexcode for styledTextfield
ivonne-hernandez Dec 13, 2023
434f71c
Merge branch 'Marianna/734/typography-updates' of https://github.com/…
CalebPena Dec 13, 2023
dc155ff
add warning message to go back and update the screen
CalebPena Dec 13, 2023
1a381e4
remove hover color from style controller css variable
CalebPena Dec 13, 2023
9d79a92
Updated step 2 header. Switched h2 element to strong
mexi-cano Dec 13, 2023
1cbc2c7
Merge pull request #807 from Gary-Community-Ventures/Marianna/744/Step-8
CalebPena Dec 13, 2023
0e65c8d
Merge branch 'Marianna/734/typography-updates' of https://github.com/…
CalebPena Dec 13, 2023
4307cc0
move back button css style into style controler
myang1010 Dec 13, 2023
baa0379
Merge branch 'Marianna/734/typography-updates' into rebrand/step-6
myang1010 Dec 13, 2023
84b49b6
Move inline styles to option-card css classes & styleController
ivonne-hernandez Dec 13, 2023
c16cd6a
Fix formatting
ivonne-hernandez Dec 13, 2023
f9fe0c7
Move HealthInsuranceOptionsList type inside of its corresponding file
ivonne-hernandez Dec 13, 2023
633916d
update style controller with current changes
CalebPena Dec 13, 2023
bf45e52
Make hexcodes uppercase
ivonne-hernandez Dec 13, 2023
e8c5fa5
Merge pull request #764 from Gary-Community-Ventures/refactor/step-3-…
CalebPena Dec 13, 2023
03bf44e
Merge branch 'Marianna/734/typography-updates' of https://github.com/…
CalebPena Dec 13, 2023
295206b
Change the current-household-member & member-added-relation color
ivonne-hernandez Dec 13, 2023
f2d9400
remove unused class name
myang1010 Dec 13, 2023
970ee09
Revert changes to member-added-relationship
ivonne-hernandez Dec 13, 2023
83e2ae0
Add inline marginBottom property for all sections
ivonne-hernandez Dec 13, 2023
4f713b8
Merge pull request #770 from Gary-Community-Ventures/refactor/update_…
CalebPena Dec 13, 2023
6b16618
Merge pull request #800 from Gary-Community-Ventures/refactor/brandin…
CalebPena Dec 13, 2023
7bc0052
Merge branch 'Marianna/734/typography-updates' of https://github.com/…
CalebPena Dec 13, 2023
f7cf75a
Merge branch 'Marianna/734/typography-updates' of https://github.com/…
CalebPena Dec 13, 2023
6d402a9
update progress bar color
CalebPena Dec 13, 2023
791a10b
Adjust income-question-padding
ivonne-hernandez Dec 13, 2023
50428f5
Merge branch 'Marianna/734/typography-updates' into rebrand/hhdb-cond…
ivonne-hernandez Dec 13, 2023
a43cd92
Merge branch 'Marianna/734/typography-updates' into rebrand/step-6
myang1010 Dec 13, 2023
8c43b20
pass prettier check
myang1010 Dec 13, 2023
f56e8b1
Merge pull request #790 from Gary-Community-Ventures/rebrand/step-6
CalebPena Dec 14, 2023
d1c2d25
change progress bar color
CalebPena Dec 14, 2023
9b68371
Changing font & color for secondary heading
Mdemenko1 Dec 14, 2023
da5d9a2
fix unaligned checkboxes
CalebPena Dec 14, 2023
d48428e
add top margin to back and continue buttons and remove continue butto…
myang1010 Dec 14, 2023
5d04fc5
Remove & add css vars from styleController
ivonne-hernandez Dec 14, 2023
932baf8
Add main-max-width back in
ivonne-hernandez Dec 14, 2023
bbfb286
Merge branch 'Marianna/734/typography-updates' into rebrand/hhdb-cond…
ivonne-hernandez Dec 14, 2023
41c0ba6
Merge pull request #803 from Gary-Community-Ventures/rebrand/hhdb-con…
CalebPena Dec 14, 2023
de65d74
add different hover color for 211co
CalebPena Dec 14, 2023
67ce295
Updated brighter terra cotta color and set as icon color.
mexi-cano Dec 14, 2023
42122d4
make error message red again
CalebPena Dec 14, 2023
daf9470
Merge branch 'Marianna/734/typography-updates' into Marianna/updating…
CalebPena Dec 14, 2023
8b0fd7d
Merge branch 'Marianna/734/typography-updates' into refactor/branding…
mexi-cano Dec 14, 2023
70a94d1
Merge pull request #813 from Gary-Community-Ventures/rebrand/adjust-b…
CalebPena Dec 14, 2023
299ccf5
Merge branch 'Marianna/734/typography-updates' of https://github.com/…
CalebPena Dec 14, 2023
85c5132
Updated confirmation icon colors.
mexi-cano Dec 14, 2023
2620be4
Merge branch 'Marianna/734/typography-updates' of https://github.com/…
CalebPena Dec 14, 2023
943b5a7
Merge branch 'Marianna/734/typography-updates' of https://github.com/…
CalebPena Dec 14, 2023
20a2607
Update src/App.css
CalebPena Dec 14, 2023
87c5b31
Merge pull request #812 from Gary-Community-Ventures/Marianna/updatin…
CalebPena Dec 14, 2023
596317f
Merge pull request #771 from Gary-Community-Ventures/refactor/loading…
CalebPena Dec 14, 2023
d9d7ee9
Merge pull request #802 from Gary-Community-Ventures/refactor/brandin…
CalebPena Dec 14, 2023
ce47933
Merge branch 'Marianna/734/typography-updates' of https://github.com/…
CalebPena Dec 14, 2023
faed732
Fix TS error by adding any type to OptionCardGroupDetails options
ivonne-hernandez Dec 14, 2023
b1d5c26
Fix formatting
ivonne-hernandez Dec 14, 2023
dd309eb
Merge branch 'Marianna/734/typography-updates' of github.com:Gary-Com…
ivonne-hernandez Dec 14, 2023
ad8f476
Merge branch 'Marianna/734/typography-updates' of https://github.com/…
CalebPena Dec 14, 2023
2faac31
211 icon colors
CalebPena Dec 14, 2023
8953964
change button
CalebPena Dec 14, 2023
925bde4
Change color, height, remove drop shadow
ivonne-hernandez Dec 14, 2023
10dc618
fix option card spacing
CalebPena Dec 14, 2023
b9b7964
Add .MuiPaper-root to make css rule more specific
ivonne-hernandez Dec 14, 2023
cec9ae4
Refactor css logo styles
ivonne-hernandez Dec 14, 2023
2636b23
Fix formatting
ivonne-hernandez Dec 14, 2023
7031747
Merge pull request #815 from Gary-Community-Ventures/refactor/header
CalebPena Dec 15, 2023
606b67c
Merge branch 'Marianna/734/typography-updates' of https://github.com/…
CalebPena Dec 15, 2023
3c8ba62
Merge branch 'Marianna/734/typography-updates' into feat/211_branding…
CalebPena Dec 19, 2023
bac6072
update 211 header
CalebPena Dec 19, 2023
83fa18e
fix title to not include spaces in name
CalebPena Dec 19, 2023
67b278e
use different label for page one continue button
CalebPena Dec 19, 2023
2af3034
Merge pull request #814 from Gary-Community-Ventures/feat/211_brandin…
CalebPena Dec 19, 2023
d649a4a
Merge branch 'Marianna/734/typography-updates' into feat/incomplete_r…
CalebPena Dec 19, 2023
bb89f19
Merge pull request #810 from Gary-Community-Ventures/feat/incomplete_…
CalebPena Dec 19, 2023
c835367
Merge branch 'main' of https://github.com/Gary-Community-Ventures/ben…
CalebPena Dec 19, 2023
243cc70
Merge branch 'Marianna/734/typography-updates' of https://github.com/…
CalebPena Dec 19, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
<meta name="description" content="MyFriendBen, a Colorado public benefits and public assistance screening tool." />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" />
<link
rel="stylesheet"
href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@300;400;700&family=Roboto:wght@300;400;500;700&family=Roboto+Slab:wght@700&display=swap"
/>
<title>MyFriendBen</title>
</head>

Expand Down
42 changes: 40 additions & 2 deletions src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
margin: 0%;
}

#root {
overflow-x: hidden;
position: relative;
}

.benefits-form {
margin: 0 auto 20px auto;
justify-content: center;
Expand All @@ -24,9 +29,22 @@
.sub-header {
font-size: 2rem;
font-weight: 700;
line-height: normal;
font-family: 'Roboto Slab', serif;
color: var(--main-header-color);
margin-bottom: 1rem;
}

.main-paragraph {
font-family: 'Open Sans';
font-weight: 400;
font-size: 1.1rem;
}

.sub-header-language-select {
font-family: 'Open Sans', sans-serif;
color: black;
margin-bottom: 1rem;
padding-bottom: 1rem;
border-bottom: 1px solid #505c66;
}

.bottom-border {
Expand Down Expand Up @@ -74,3 +92,23 @@
max-width: var(--main-max-width);
margin: auto;
}
.secondary-heading {
font-family: 'Open Sans', sans-serif;
color: black;
}

/* the following section classes are needed in order to extend the background to the edges of the screen */
.section-container {
position: relative;
}

.section:before {
content: '';
position: absolute;
height: 100%;
top: 0;
left: -100vw;
width: 300vw;
background: var(--secondary-background-color);
z-index: -1;
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading