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

replace Nunito font into Poppins #3830

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ const WeVoteBody = styled('div')`
background-color: #fff; // rgb(235, 236, 238); // #fafafa;
color: #333;
display: block;
font-family: "Nunito Sans", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
font-family: "Poppins", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
line-height: 1.4;
margin: 0 auto;
// max-width: 960px;
Expand Down
4 changes: 2 additions & 2 deletions src/css/main.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@charset "UTF-8";
@import "https://fonts.googleapis.com/css?family=Nunito+Sans:400,700&display=swap";
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap');

/*!
July 31, 2023: ran https://www.cssportal.com/css-optimize/ to shrink the size of the file
Expand Down Expand Up @@ -54,7 +54,7 @@ html {
body {
background-color:#fff;
color:#000;
font-family:"Nunito Sans","Helvetica Neue Light","Helvetica Neue","Helvetica","Arial",sans-serif;
font-family: "Poppins", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
font-size:16px;
font-style:normal;
font-weight:normal;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ const SupportersText = styled('span', {
})(({ inCompressedMode }) => (`
color: black !important;
font-size: ${inCompressedMode ? '16px' : '18px'};
font-weight: ${inCompressedMode ? '400' : '800'};
font-weight: ${inCompressedMode ? '400' : '600'};
`));

const TextWrapper = styled('div')`
Expand Down
2 changes: 1 addition & 1 deletion src/js/common/components/Settings/VoterPhotoUpload.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ const styles = (theme) => ({
dropzoneText: {
color: '#818181',
fontSize: '18px',
fontFamily: "'Nunito Sans', 'Helvetica Neue Light', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
fontFamily: "'Poppins', 'Helvetica Neue Light', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
fontWeight: '300',
paddingLeft: 5,
paddingRight: 5,
Expand Down
2 changes: 1 addition & 1 deletion src/js/common/stories/button.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.storybook-button {
font-family: 'Nunito Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-family: 'Poppins', 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-weight: 700;
border: 0;
border-radius: 3em;
Expand Down
2 changes: 1 addition & 1 deletion src/js/components/Navigation/HeaderBarSuspense.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export default function HeaderBarSuspense () {
position: 'relative',
color: 'rgb(51, 51, 51)',
backgroundColor: 'white',
fontFamily: '"Nunito Sans", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, sans-serif',
fontFamily: '"Poppins", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, sans-serif',
height: '48px',
boxShadow: standardBoxShadow('wide'),
}}
Expand Down
6 changes: 3 additions & 3 deletions src/js/components/Ready/ElectionCountdown.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ const CardCountdownInternalWrapper = styled('div')`
const CardTitleUpcoming = styled('h1')(({ theme }) => (`
color: #2E3C5D !important;
font-size: 64px;
font-weight: 900;
font-weight: 600;
margin-bottom: 8px;
margin-top: 12px;
text-align: center;
Expand All @@ -345,7 +345,7 @@ const CardTitleUpcoming = styled('h1')(({ theme }) => (`
const CardTitleToday = styled('h1')(({ theme }) => (`
color: #2E3C5D !important;
font-size: 60px;
font-weight: 900;
font-weight: 600;
margin-bottom: 8px;
margin-top: 0;
text-align: center;
Expand All @@ -358,7 +358,7 @@ const CardSubTitle = styled('h3', {
shouldForwardProp: (prop) => !['desktopMode', 'center'].includes(prop),
})(({ desktopMode, center }) => (`
font-size: ${desktopMode ? '18px' : '22px'};
font-weight: 700;
font-weight: 400;
color: #2E3C5D !important;
margin-bottom: 0 !important;
margin-top: ${desktopMode ? '24px' : null};
Expand Down
2 changes: 1 addition & 1 deletion src/js/components/Ready/ReadyTaskBallot.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@ const styles = (theme) => ({
color: 'rgb(51, 51, 51)',
display: 'flex',
flexDirection: 'column',
fontFamily: '"Nunito Sans", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, sans-serif',
fontFamily: '"Poppins", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, sans-serif',
fontSize: 16,
height: 173,
lineHeight: 22,
Expand Down
12 changes: 6 additions & 6 deletions src/js/components/Style/muiStyleOverrides.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const muiStyleOverrides = {
styleOverrides: {
root: {
boxShadow: 'unset',
fontFamily: '"Nunito Sans", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", sans-serif',
fontFamily: '"Poppins", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", sans-serif',
fontSize: '16px',
textTransform: 'none',
userSelect: 'none',
Expand All @@ -35,31 +35,31 @@ const muiStyleOverrides = {
MuiChip: {
styleOverrides: {
root: {
fontFamily: '"Nunito Sans", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", sans-serif',
fontFamily: '"Poppins", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", sans-serif',
fontSize: 16,
},
},
},
MuiFormControlLabel: {
styleOverrides: {
root: {
fontFamily: '"Nunito Sans", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", sans-serif',
fontFamily: '"Poppins", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", sans-serif',
marginBottom: '-.5rem',
},
},
},
MuiInputBase: {
styleOverrides: {
root: {
fontFamily: '"Nunito Sans", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", sans-serif',
fontFamily: '"Poppins", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", sans-serif',
fontSize: 16,
},
},
},
MuiMenuItem: {
styleOverrides: {
root: {
fontFamily: '"Nunito Sans", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", sans-serif',
fontFamily: '"Poppins", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", sans-serif',
marginTop: '-6px',
minHeight: 34,
},
Expand All @@ -68,7 +68,7 @@ const muiStyleOverrides = {
MuiTab: {
styleOverrides: {
root: {
fontFamily: '"Nunito Sans", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", sans-serif',
fontFamily: '"Poppins", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", sans-serif',
fontSize: 16,
outline: 'none !important',
textTransform: 'none',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ export default function AddCandidateExtensionForm (props) {
name="candidateName"
id="candidateName"
defaultValue={candidate.candidateName}
InputLabelProps={{ style: { fontFamily: 'Nunito Sans' } }}
InputProps={{ style: { fontFamily: 'Nunito Sans' } }}
InputLabelProps={{ style: { fontFamily: 'Poppins' } }}
InputProps={{ style: { fontFamily: 'Poppins' } }}
onBlur={handleBlur}
/>
<CandidateTextField
Expand All @@ -154,8 +154,8 @@ export default function AddCandidateExtensionForm (props) {
name="candidateSpecificEndorsementUrl"
id="candidateSpecificEndorsementUrl"
defaultValue={candidate.candidateSpecificEndorsementUrl}
InputLabelProps={{ style: { fontFamily: 'Nunito Sans' } }}
InputProps={{ style: { fontFamily: 'Nunito Sans' } }}
InputLabelProps={{ style: { fontFamily: 'Poppins' } }}
InputProps={{ style: { fontFamily: 'Poppins' } }}
onBlur={handleBlur}
/>
<CandidateTextField
Expand All @@ -167,8 +167,8 @@ export default function AddCandidateExtensionForm (props) {
name="endorsementPageUrl"
id="endorsementURL"
defaultValue={candidate.endorsementPageUrl}
InputLabelProps={{ style: { fontFamily: 'Nunito Sans' } }}
InputProps={{ style: { fontFamily: 'Nunito Sans' } }}
InputLabelProps={{ style: { fontFamily: 'Poppins' } }}
InputProps={{ style: { fontFamily: 'Poppins' } }}
onBlur={handleBlur}
/>
<CheckBoxArea>
Expand Down Expand Up @@ -216,10 +216,10 @@ export default function AddCandidateExtensionForm (props) {
// id="candidateURL"
defaultValue={candidate.endorsementText}
InputLabelProps={{
style: { fontFamily: 'Nunito Sans' },
style: { fontFamily: 'Poppins' },
shrink: true,
}}
InputProps={{ style: { fontFamily: 'Nunito Sans' } }}
InputProps={{ style: { fontFamily: 'Poppins' } }}
onBlur={handleBlur}
rows="5"
// maxRows="5"
Expand All @@ -242,7 +242,7 @@ const CandidateForm = styled('div')`

const CandidateTextField = styled(TextField)`
display: block;
font-family: "Nunito Sans", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
font-family: "Poppins", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
margin-bottom: 10px;
`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ export default function EditCandidateForExtensionForm (props) {
label="Candidate Name"
name="candidateName"
defaultValue={candidate.candidateName}
InputLabelProps={{ style: { fontFamily: 'Nunito Sans' } }}
InputProps={{ style: { fontFamily: 'Nunito Sans' } }}
InputLabelProps={{ style: { fontFamily: 'Poppins' } }}
InputProps={{ style: { fontFamily: 'Poppins' } }}
onBlur={handleBlur}
/>
<CandidateTextField
Expand All @@ -76,8 +76,8 @@ export default function EditCandidateForExtensionForm (props) {
label="Campaign URL"
name="candidateCampaignUrl"
defaultValue={candidate.candidateCampaignUrl}
InputLabelProps={{ style: { fontFamily: 'Nunito Sans' }, shrink: true }}
InputProps={{ style: { fontFamily: 'Nunito Sans' } }}
InputLabelProps={{ style: { fontFamily: 'Poppins' }, shrink: true }}
InputProps={{ style: { fontFamily: 'Poppins' } }}
onBlur={handleBlur}
/>
<CandidateTextField
Expand All @@ -88,8 +88,8 @@ export default function EditCandidateForExtensionForm (props) {
label="Endorsement URL"
name="endorsementPageUrl"
defaultValue={candidate.endorsementPageUrl}
InputLabelProps={{ style: { fontFamily: 'Nunito Sans' } }}
InputProps={{ style: { fontFamily: 'Nunito Sans' } }}
InputLabelProps={{ style: { fontFamily: 'Poppins' } }}
InputProps={{ style: { fontFamily: 'Poppins' } }}
onBlur={handleBlur}
/>
<CheckBoxArea>
Expand Down Expand Up @@ -135,8 +135,8 @@ export default function EditCandidateForExtensionForm (props) {
label="Endorsement Text"
name="statementText"
defaultValue={candidate.statementText === 'null' ? '' : candidate.statementText}
InputLabelProps={{ style: { fontFamily: 'Nunito Sans' }, shrink: true }}
InputProps={{ style: { fontFamily: 'Nunito Sans' } }}
InputLabelProps={{ style: { fontFamily: 'Poppins' }, shrink: true }}
InputProps={{ style: { fontFamily: 'Poppins' } }}
onBlur={handleBlur}
rows="5"
// maxRows="5"
Expand All @@ -161,7 +161,7 @@ const CandidateForm = styled('div')`

const CandidateTextField = styled(TextField)`
display: block;
font-family: "Nunito Sans", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
font-family: "Poppins", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
margin-bottom: 10px;
`;

Expand Down
157 changes: 157 additions & 0 deletions storybook-static/426.fea71842.iframe.bundle.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions storybook-static/426.fea71842.iframe.bundle.js.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions storybook-static/433.a9f030be.iframe.bundle.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions storybook-static/603.16b9e03a.iframe.bundle.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions storybook-static/607.aa6aed84.iframe.bundle.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

351 changes: 351 additions & 0 deletions storybook-static/719.4a09b182.iframe.bundle.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions storybook-static/719.4a09b182.iframe.bundle.js.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions storybook-static/729.f1efcfdf.iframe.bundle.js

Large diffs are not rendered by default.

Loading
Loading