Skip to content

Commit 0b72f53

Browse files
bruceplaibruceplai
authored
Merge branch 'main' into Hover_Cookie_Box
2 parents b1d2cee + 122ca5c commit 0b72f53

File tree

15 files changed

+113
-31
lines changed

15 files changed

+113
-31
lines changed

‎src/components/ContributorThumbnail.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,8 @@ const Thumbnail = ({
243243
</Grid>
244244
<Grid item className={classes.affthumbnailText}>
245245
<Typography
246-
variant={isChildThumbnail ? 'body1' : 'h6'}
246+
variant={isChildThumbnail ? 'h6' : 'h5'}
247+
aria-level={isChildThumbnail ? '4' : '3'}
247248
noWrap
248249
data-cy='contributor-thumbnail-text'
249250
className={

‎src/components/FAQCard/accordionSection.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ const AccordionSection = (props) => {
7070
data-cy='faq-question'
7171
expandIcon={<ExpandMoreRoundedIcon />}
7272
>
73-
<Typography variant='h6'>{faq.question}</Typography>
73+
<Typography variant='h6' aria-level='3'>
74+
{faq.question}
75+
</Typography>
7476
</AccordionSummary>
7577
<Divider />
7678
<AccordionDetails data-cy='faq-answer' className={classes.detail}>

‎src/components/FAQCard/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const FAQCard = (props) => {
3737
<Container>
3838
<Grid container justify='center'>
3939
<Grid item xs={12} sm={9} lg={11} className={classes.titleContainer}>
40-
<Typography variant='h6' className={classes.title}>
40+
<Typography variant='h6' aria-level='2' className={classes.title}>
4141
{props.title}
4242
</Typography>
4343
</Grid>

‎src/components/PictureCard.js‎

Lines changed: 50 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,26 +58,65 @@ export default function PictureCard(props) {
5858

5959
return (
6060
<>
61-
<Box className='containerGray' pt='30px' pb='115px' >
61+
<Box className='containerGray' pt='30px' pb='115px'>
6262
<Container>
63-
<Grid container display="flex" justify="flex-start" >
64-
<Grid item xs={8} md={8} lg={5} align='center' className={classes.item1_img} >
63+
<Grid container display='flex' justify='flex-start'>
64+
<Grid
65+
item
66+
xs={8}
67+
md={8}
68+
lg={5}
69+
align='center'
70+
className={classes.item1_img}
71+
>
6572
<img src={items[0].src} alt={items[0].alt} />
6673
</Grid>
67-
<Grid item xs={8} md={8} lg={5} className={classes.item1_txt} >
68-
<Typography variant='h4' className={classes.textStyle} >{items[0].children}</Typography>
74+
<Grid item xs={8} md={8} lg={5} className={classes.item1_txt}>
75+
<Typography
76+
variant='h4'
77+
aria-level='2'
78+
className={classes.textStyle}
79+
>
80+
{items[0].children}
81+
</Typography>
6982
</Grid>
70-
<Grid item xs={8} md={8} lg={5} align='center' className={classes.item2_img} >
83+
<Grid
84+
item
85+
xs={8}
86+
md={8}
87+
lg={5}
88+
align='center'
89+
className={classes.item2_img}
90+
>
7191
<img src={items[1].src} alt={items[1].alt} />
7292
</Grid>
73-
<Grid item xs={8} md={8} lg={5} className={classes.item2_txt} >
74-
<Typography variant='h4' className={classes.textStyle} >{items[1].children}</Typography>
93+
<Grid item xs={8} md={8} lg={5} className={classes.item2_txt}>
94+
<Typography
95+
variant='h4'
96+
aria-level='2'
97+
className={classes.textStyle}
98+
>
99+
{items[1].children}
100+
</Typography>
75101
</Grid>
76-
<Grid item xs={8} md={8} lg={5} align='center' className={classes.item3_img} >
102+
<Grid
103+
item
104+
xs={8}
105+
md={8}
106+
lg={5}
107+
align='center'
108+
className={classes.item3_img}
109+
>
77110
<img src={items[2].src} alt={items[2].alt} />
78111
</Grid>
79-
<Grid item xs={8} md={8} lg={5} className={classes.item3_txt} >
80-
<Typography variant='h4' className={classes.textStyle} >{items[2].children}</Typography>
112+
<Grid item xs={8} md={8} lg={5} className={classes.item3_txt}>
113+
<Typography
114+
variant='h4'
115+
aria-level='2'
116+
className={classes.textStyle}
117+
>
118+
{items[2].children}
119+
</Typography>
81120
</Grid>
82121
</Grid>
83122
</Container>

‎src/components/TitleSection.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const TitleSection = (props) => {
3333
<Grid container>
3434
<Grid item xs={1} md={2} />
3535
<Grid item xs={10} md={8}>
36-
<Typography variant='h1' className={classes.titleStyle}>
36+
<Typography variant='h1' aria-level='1' className={classes.titleStyle}>
3737
{title}
3838
</Typography>
3939
</Grid>

‎src/pages/Collaborate/LeftTextRightImage.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,17 @@ const LeftTextRightImage = ({
102102
return (
103103
<Grid container className={classes.leftContainerStyle}>
104104
<Paper elevation={0} className={classes.leftInnerTextCardContainer}>
105-
<Typography className={classes.leftCardHeading} variant='h4'>
105+
<Typography
106+
variant='h4'
107+
aria-level='2'
108+
className={classes.leftCardHeading}
109+
>
106110
{' '}
107111
{mainHeading}{' '}
108112
</Typography>
109113
<Typography
110114
variant='h6'
115+
aria-level='3'
111116
color='primary'
112117
className={classes.leftSubcardHeading}
113118
>

‎src/pages/Collaborate/RightTextLeftImage.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,17 @@ const RightImageLeftText = ({
100100
/>
101101
</Card>
102102
<Paper elevation={0} className={classes.rightInnerTextCardContainer}>
103-
<Typography className={classes.rightCardHeading} variant='h4'>
103+
<Typography
104+
variant='h4'
105+
aria-level='2'
106+
className={classes.rightCardHeading}
107+
>
104108
{' '}
105109
{mainHeading}{' '}
106110
</Typography>
107111
<Typography
108112
variant='h6'
113+
aria-level='3'
109114
color='primary'
110115
className={classes.rightSubcardHeading}
111116
>

‎src/pages/Contributors/UnaffiliatedOrganizations.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export const UnaffiliatedOrganizations = (props) => {
6363
return (
6464
<Grid>
6565
<Grid style={{ padding: '24px 0px 32px' }}>
66-
<Typography variant='h4' className={classes.unAfflText}>
66+
<Typography variant='h4' aria-level='2' className={classes.unAfflText}>
6767
Unaffiliated Organizations
6868
<span style={{ paddingLeft: '1px' }}>
6969
{' '}

‎src/pages/Donate/index.js‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,20 @@ const Donate = () => {
2929
<Container>
3030
<Grid container>
3131
<Grid item xs={12} sm={6} className={classes.infoGrid}>
32-
<Typography variant='h4' className={classes.infoDescription}>
32+
<Typography
33+
variant='h4'
34+
aria-level='2'
35+
className={classes.infoDescription}
36+
>
3337
The Civic Tech Index is being developed by Hack For LA, and is
3438
currently taking donations through Code For America.
3539
</Typography>
3640
<Typography variant='body1' className={classes.infoSteps}>
3741
1. Please follow this link to the Code For America{' '}
38-
<Link to='https://www.codeforamerica.org/donate' target="_blank">
42+
<Link
43+
to='https://www.codeforamerica.org/donate'
44+
target='_blank'
45+
>
3946
donation form
4047
</Link>
4148
.
@@ -44,7 +51,11 @@ const Donate = () => {
4451
2. To make a donation to the Civic Tech Index, please select{' '}
4552
Hack for LA under the brigades listed.
4653
</Typography>
47-
<Typography variant='h5' className={classes.infoThank}>
54+
<Typography
55+
variant='h5'
56+
aria-level='2'
57+
className={classes.infoThank}
58+
>
4859
We appreciate your contribution.
4960
</Typography>
5061
</Grid>

‎src/pages/Home/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ const Home = () => {
101101
justify='center'
102102
className={classes.localTitleSectionStyle}>
103103
<Grid item xs={11} md={8} lg={10}>
104-
<Typography variant='h2' className={classes.localTitleStyle}>
104+
<Typography variant='h2' aria-level='1' className={classes.localTitleStyle}>
105105
Join a worldwide movement to catalog every open-source civic
106106
tech project.
107107
</Typography>

0 commit comments

Comments
 (0)