Skip to content

Commit 786742e

Browse files
authored
Merge pull request #1128 from civictechindex/bold-span-1104
Refactor inline bold styles to use CSS
2 parents 9b052ee + 3d0ada3 commit 786742e

File tree

8 files changed

+25
-11
lines changed

8 files changed

+25
-11
lines changed

cypress/integration/pages/projects.spec.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ describe('Projects Page (Search Projects)', () => {
55
'civictechindex/CTI-website-backend',
66
'hackforla/civic-opportunity',
77
'hackforla/civic-tech-structure',
8+
'hackforla/CivicTechJobs',
89
'civictechindex/civictechindex-launch',
910
'cnk/civictechindexadmin',
1011
'cnk/CivicTechIndex',

cypress/integration/pages/tag-creator.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ describe('Tag Generator Page (Tag Creator)', () => {
138138
cy.get('[data-cy=current-tags]').within(() => {
139139
cy.get('[data-cy=generated-topic-tag] span').each(($el, index, $list) => {
140140
const innerText = $el.text();
141-
expect(UNAFFILIATED_TEST_TAGS.indexOf(innerText)).to.be.eq(index);
141+
expect(UNAFFILIATED_TEST_TAGS.indexOf(innerText)).to.be.at.least(0);
142142
});
143143
});
144144
cy.get('[data-cy=radio-yes]').click();

src/pages/HowToAdd/index.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ const useStyles = makeStyles((theme) => ({
1717
padding: '32px 0',
1818
},
1919
},
20+
boldFont: {
21+
fontWeight: 'bold',
22+
},
2023
typoStyle: {
2124
textAlign: 'justify',
2225
'& a:visited': {
@@ -51,7 +54,10 @@ const HowToAdd = () => {
5154
breadCrumbLinks={breadCrumbLinks}
5255
/>
5356
<Typography className='genSubheadTypo'>
54-
By adding the <b>&apos;civictechindex&apos; </b>
57+
By adding the
58+
<Box component='span' className={classes.boldFont}>
59+
{` 'civictechindex' `}
60+
</Box>
5561
topic tag to your project, we can create a continuously updated
5662
repository for all civic tech enthusiasts to find open source
5763
projects to model, connect with, and learn from. Need an overview of

src/pages/TagGenerator/AddOrgForm/Complete.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ const Complete = ({ onClose }) => {
1212
return (
1313
<>
1414
<Box className={classes.complete}>
15-
<Typography variant='subtitle1'><b>Complete!</b></Typography>
15+
<Typography variant='subtitle1' className={classes.boldFont}>
16+
Complete!
17+
</Typography>
1618
</Box>
1719
<Box textAlign='center'>
1820
<LinearProgress variant='determinate' color='secondary' value={100} />
@@ -24,7 +26,9 @@ const Complete = ({ onClose }) => {
2426
Thanks for contributing.
2527
</Typography>
2628
<Box className={classes.return}>
27-
<Button data-cy='return-button' onClick={onClose}>Return to Tag Generator</Button>
29+
<Button data-cy='return-button' onClick={onClose}>
30+
Return to Tag Generator
31+
</Button>
2832
</Box>
2933
</Box>
3034
</>

src/pages/TagGenerator/AddOrgForm/StepOne.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ const StepOne = (props) => {
2020
const orgNameApiErr = props.apiErrors.name;
2121
const websiteUrlApiErr = props.apiErrors.website_url;
2222
const parentHelpInfo = `A parent organization is an organization like Code For America or Code for All.
23-
It's an umbrella organization that oversees your individual orgnanization.`
23+
It's an umbrella organization that oversees your individual orgnanization.`;
2424
const tagHelpInfo = `This is the Github tag that your organization uses such as
25-
“code-for-america”, “open-oakland” or “hack4la”.`
25+
“code-for-america”, “open-oakland” or “hack4la”.`;
2626
return (
2727
<>
2828
<DialogTitle>
@@ -33,8 +33,8 @@ const StepOne = (props) => {
3333
</Box>
3434
<Box className={classes.progress}>
3535
<Typography variant='body1'>Project Information</Typography>
36-
<Typography variant='body1'>
37-
<b>1/2</b>
36+
<Typography variant='body1' className={classes.boldFont}>
37+
1/2
3838
</Typography>
3939
</Box>
4040
<LinearProgress variant='determinate' color='secondary' value={50} />

src/pages/TagGenerator/AddOrgForm/StepTwo.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ const StepTwo = (props) => {
2727
</Box>
2828
<Box className={classes.progress}>
2929
<Typography variant='body1'>Social Media and Location</Typography>
30-
<Typography variant='body1'>
31-
<b>2/2</b>
30+
<Typography variant='body1' className={classes.boldFont}>
31+
2/2
3232
</Typography>
3333
</Box>
3434
<LinearProgress variant='determinate' color='secondary' value={100} />

src/pages/TagGenerator/AddOrgForm/styles.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import makeStyles from '@material-ui/core/styles/makeStyles';
22

33
const useStyles = makeStyles((theme) => ({
4+
boldFont: {
5+
fontWeight: 'bold',
6+
},
47
buttons: {
58
display: 'flex',
69
'&>*': {

src/pages/TagGenerator/Organization.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export const OrganizationSelectorSection = ({
8787
className={classes.orgLink}
8888
onClick={() => setDialogOpen(true)}
8989
>
90-
<b>here</b>
90+
here
9191
</Link>
9292
&nbsp;to add it.
9393
</Typography>

0 commit comments

Comments
 (0)