Skip to content

Commit 3622882

Browse files
bruceplaibruceplai
authored
Merge branch 'main' into update-landing-909
2 parents e7c99e8 + c2fbd04 commit 3622882

File tree

13 files changed

+318
-304
lines changed

13 files changed

+318
-304
lines changed

‎public/images/fb-logo.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎public/images/github-logo.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎public/images/insta-logo.svg‎

Lines changed: 5 additions & 0 deletions
Loading

‎public/images/twitter-logo.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎src/pages/RadicalCollaboration/Share/styles.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ const useStyles = makeStyles((theme) => ({
5959
width: '218px',
6060
},
6161
media: {
62+
display: 'flex',
63+
justifyContent: 'center',
6264
height: '64px',
6365
width: '64px',
6466
},

‎src/pages/TagCreator/AffilationQuestionSection.js‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,7 @@ import React from 'react';
22
import Radio from '@material-ui/core/Radio';
33
import Grid from '@material-ui/core/Grid';
44
import Typography from '@material-ui/core/Typography';
5-
import { makeStyles } from '@material-ui/core/styles';
6-
7-
const useStyles = makeStyles((theme) => ({
8-
containerPadding: {
9-
paddingTop: '20px',
10-
},
11-
gridPadding: {
12-
padding: '10px',
13-
'& a:visited': {
14-
color: theme.palette.secondary.main,
15-
},
16-
},
17-
}));
5+
import useStyles from './styles';
186

197
export const AffiliationQuestionSection = ({
208
value,
@@ -24,8 +12,8 @@ export const AffiliationQuestionSection = ({
2412
const classes = useStyles();
2513
return (
2614
<>
27-
<Grid container className={classes.containerPadding}>
28-
<Grid item xs={12} className={classes.gridPadding}>
15+
<Grid container className={classes.questionContainerPadding}>
16+
<Grid item xs={12} className={classes.questionGridPadding}>
2917
<Typography variant='body1'>{question}</Typography>
3018
</Grid>
3119
<Grid item xs={4} sm={8}>

‎src/pages/TagCreator/BottomSection.js‎

Lines changed: 4 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1,123 +1,21 @@
11
import React, { useState } from 'react';
22
import Box from '@material-ui/core/Box';
33
import Container from '@material-ui/core/Container';
4-
import { makeStyles } from '@material-ui/core/styles';
4+
import useStyles from './styles';
55
import Paper from '@material-ui/core/Paper';
66
import Grid from '@material-ui/core/Grid';
77
import Typography from '@material-ui/core/Typography';
88
import Button from '@material-ui/core/Button';
99
import Confetti from '../../components/Confetti';
1010

11-
const useStyles = makeStyles((theme) => ({
12-
btnStyle: {
13-
'& .MuiButton-label': {
14-
whiteSpace: 'inherit',
15-
},
16-
},
17-
txtStyle: {
18-
textAlign: 'center',
19-
fontWeight: 700,
20-
color: '#042D5F',
21-
[theme.breakpoints.down('sm')]: {
22-
fontSize: '1.5rem',
23-
},
24-
},
25-
gridStyle: {
26-
padding: '8px',
27-
[theme.breakpoints.up('md')]: {
28-
width: '292px',
29-
},
30-
[theme.breakpoints.down('md')]: {
31-
width: '270px',
32-
},
33-
},
34-
paper: {
35-
margin: '24px auto 24px auto',
36-
textAlign: 'center',
37-
[theme.breakpoints.down('sm')]: {
38-
margin: '0',
39-
},
40-
},
41-
ptextStyle: {
42-
fontWeight: 700,
43-
textAlign: 'center',
44-
color: theme.palette.spectrum.darkBlue,
45-
paddingBottom: theme.spacing(2),
46-
[theme.breakpoints.up('md')]: {
47-
fontSize: '1.25rem',
48-
},
49-
[theme.breakpoints.down('md')]: {
50-
fontSize: '1.125rem',
51-
},
52-
[theme.breakpoints.down('sm')]: {
53-
fontSize: '1rem',
54-
},
55-
},
56-
routingBtnBeforeClick: {
57-
backgroundColor: theme.palette.background.default,
58-
border: '1px solid',
59-
borderColor: theme.palette.background.darkGray,
60-
color: theme.palette.spectrum.darkBlue,
61-
'&:hover': {
62-
background: 'none',
63-
},
64-
},
65-
routingBtnAfterClick: {
66-
backgroundColor: theme.palette.spectrum.lightBlue,
67-
border: '1px solid',
68-
borderColor: theme.palette.background.darkGray,
69-
color: theme.palette.spectrum.white,
70-
},
71-
containerAboveBtnStyle: {
72-
[theme.breakpoints.up('md')]: {
73-
marginTop: theme.spacing(8),
74-
},
75-
[theme.breakpoints.down('md')]: {
76-
marginTop: theme.spacing(6),
77-
},
78-
[theme.breakpoints.down('sm')]: {
79-
marginTop: theme.spacing(4),
80-
},
81-
},
82-
btnContainerStyle: {
83-
[theme.breakpoints.up('md')]: {
84-
marginTop: theme.spacing(4),
85-
},
86-
[theme.breakpoints.down('sm')]: {
87-
marginTop: '14px',
88-
},
89-
},
90-
containerBelowBtnStyle: {
91-
textAlign: 'center',
92-
[theme.breakpoints.up('md')]: {
93-
marginTop: theme.spacing(4),
94-
},
95-
[theme.breakpoints.down('md')]: {
96-
marginTop: theme.spacing(2),
97-
},
98-
},
99-
linksContainerStyle: {
100-
color: theme.palette.spectrum.darkBlue,
101-
fontWeight: 400,
102-
[theme.breakpoints.up('md')]: {
103-
margin: '32px auto 30px auto',
104-
fontSize: '18px',
105-
},
106-
[theme.breakpoints.down('sm')]: {
107-
margin: '32px auto 24px auto',
108-
fontSize: '14px',
109-
},
110-
},
111-
}));
112-
11311
const BottomSection = () => {
11412
const classes = useStyles();
11513
const [addBtnClicked, setAddBtnClicked] = useState(false);
11614

11715
const renderBtnWithDescription = () => {
11816
return (
11917
<>
120-
<Typography className={classes.containerBelowBtnStyle}>
18+
<Typography className={classes.containerBelowBtnStyle}>
12119
Let us know when you&apos;ve added #civictechindex to your project!
12220
</Typography>
12321
<Grid className={classes.btnContainerStyle}>
@@ -127,7 +25,7 @@ const BottomSection = () => {
12725
setAddBtnClicked(true);
12826
}}
12927
>
130-
I've Added My Project!
28+
I&apos;ve Added My Project!
13129
</Button>
13230
</Grid>
13331
</>
@@ -194,7 +92,7 @@ const BottomSection = () => {
19492
addBtnClicked={addBtnClicked}
19593
text='Collaborate with us'
19694
btext='Learn More'
197-
bhref='/support'
95+
bhref='/support/collaborate'
19896
/>
19997
</Grid>
20098
</Grid>

‎src/pages/TagCreator/Organization.js‎

Lines changed: 8 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,9 @@ import TextField from '@material-ui/core/TextField';
77
import Autocomplete from '@material-ui/lab/Autocomplete';
88
import Link from '@material-ui/core/Link';
99
import CircularProgress from '@material-ui/core/CircularProgress';
10-
import { makeStyles } from '@material-ui/core/styles';
10+
import useStyles from './styles';
1111
import AddOrgForm from './AddOrgForm';
1212

13-
const useStyles = makeStyles((theme) => ({
14-
gridStyle: {
15-
paddingRight: '8px',
16-
[theme.breakpoints.down('xs')]: {
17-
paddingBottom: '8px',
18-
},
19-
},
20-
link: {
21-
'&:hover': {
22-
cursor: 'pointer',
23-
},
24-
},
25-
modalStyle: {
26-
overflow: 'scroll',
27-
},
28-
typoStyle: {
29-
fontWeight: '700',
30-
},
31-
orgNameSectionGrid:{
32-
padding: '30px 0px',
33-
},
34-
}));
35-
3613
export const OrganizationSelectorSection = ({
3714
orgName,
3815
setOrgName,
@@ -62,7 +39,7 @@ export const OrganizationSelectorSection = ({
6239
return (
6340
<>
6441
<Grid item xs={12} sm={12}>
65-
<p>Which Organization?</p>
42+
<Typography variant='body1'style={{ padding: '34px 0 8px' }}>Which Organization?</Typography>
6643
<Autocomplete
6744
id='organization'
6845
style={{ width: '100%' }}
@@ -102,12 +79,12 @@ export const OrganizationSelectorSection = ({
10279
)}
10380
/>
10481
</Grid>
105-
<Grid item>
82+
<Grid item style={{ paddingTop: '12px' }}>
10683
<Typography variant='body1'>
107-
Don’t see your organization? Click&nbsp;
84+
Don&apos;t see your organization? Click&nbsp;
10885
<Link
10986
id='add-org-link'
110-
className={classes.link}
87+
className={classes.orgLink}
11188
onClick={() => setDialogOpen(true)}
11289
>
11390
<b>here</b>
@@ -132,18 +109,18 @@ export const OrgNameSection = ({ setDisplayState, orgName, linkStyles }) => {
132109
alignItems='center'
133110
className={classes.orgNameSectionGrid}
134111
>
135-
<Grid item xs={12} sm={3} className={classes.gridStyle}>
112+
<Grid item xs={12} sm={3} className={classes.orgGridStyle}>
136113
<Typography variant='body1'>Affiliated Organization:</Typography>
137114
</Grid>
138115
{orgName ? (
139116
<Grid item xs={10} sm={7}>
140-
<Typography variant='body1' className={classes.typoStyle}>
117+
<Typography variant='body1' className={classes.orgTypoStyle}>
141118
{orgName}
142119
</Typography>
143120
</Grid>
144121
) : (
145122
<Grid item xs={7} style={{ paddingRight: '50px' }}>
146-
<Typography variant='body1' className={classes.typoStyle}>
123+
<Typography variant='body1' className={classes.orgTypoStyle}>
147124
Unaffiliated
148125
</Typography>
149126
</Grid>

‎src/pages/TagCreator/ProjectRepository.js‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,7 @@ import Typography from '@material-ui/core/Typography';
44
import Link from '@material-ui/core/Link';
55
import Button from '@material-ui/core/Button';
66
import TextField from '@material-ui/core/TextField';
7-
import { makeStyles } from '@material-ui/core/styles';
8-
9-
const useStyles = makeStyles((theme) => ({
10-
gridStyle: {
11-
[theme.breakpoints.down('xs')]: {
12-
paddingBottom: '8px',
13-
},
14-
},
15-
typoStyle: {
16-
fontWeight: '700',
17-
[theme.breakpoints.down('xs')]: {
18-
fontSize: '0.875rem',
19-
},
20-
},
21-
projRepoGrid:{
22-
padding: '30px 0px',
23-
},
24-
}));
7+
import useStyles from './styles';
258

269
export const ProjectRepositorySection = ({
2710
repositoryUrl,
@@ -36,14 +19,14 @@ export const ProjectRepositorySection = ({
3619
alignItems='center'
3720
className={classes.projRepoGrid}
3821
>
39-
<Grid item xs={12} sm={3} className={classes.gridStyle}>
22+
<Grid item xs={12} sm={3} className={classes.projGridStyle}>
4023
<Typography variant='body1'>Project Repository URL:</Typography>
4124
</Grid>
4225
<Grid item xs={10} sm={7} data-cy='grid-repository-url'>
4326
<Link
4427
variant='body1'
4528
href={repositoryUrl}
46-
className={classes.typoStyle}
29+
className={classes.projTypoStyle}
4730
>
4831
{repositoryUrl}
4932
</Link>

‎src/pages/TagCreator/StepComponent.js‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,23 @@ import Grid from '@material-ui/core/Grid';
44
import Typography from '@material-ui/core/Typography';
55

66
const useStyles = makeStyles((theme) => ({
7-
stepTypo:{
7+
stepTypo: {
88
color: theme.palette.spectrum.teal,
99
},
1010
}));
1111

12-
const StepComponent = ({ step,stepHeading }) => {
12+
const StepComponent = ({ step, stepHeading }) => {
1313
const classes = useStyles();
1414
return (
1515
<Grid>
16-
<Typography variant='h5' className={classes.stepTypo}>{step}</Typography>
17-
<Typography variant='h3' className={classes.stepTypo}>{stepHeading}</Typography>
16+
<Typography variant='h5' className={classes.stepTypo}>
17+
{step}
18+
</Typography>
19+
<Typography variant='h3' className={classes.stepTypo}>
20+
{stepHeading}
21+
</Typography>
1822
</Grid>
19-
)
20-
}
23+
);
24+
};
2125

22-
export default StepComponent
26+
export default StepComponent;

0 commit comments

Comments
 (0)