Skip to content

Commit bb39370

Browse files
committed
Add new pyronear font
1 parent 1e6a8db commit bb39370

File tree

9 files changed

+41
-22
lines changed

9 files changed

+41
-22
lines changed

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
"dependencies": {
1616
"@emotion/react": "^11.14.0",
1717
"@emotion/styled": "^11.14.1",
18-
"@fontsource/roboto": "^5.2.6",
18+
"@fontsource/open-sans": "^5.2.6",
19+
"@fontsource/open-sans-condensed": "^4.5.5",
1920
"@mui/icons-material": "^7.2.0",
2021
"@mui/material": "^7.2.0",
2122
"@tanstack/react-query": "^5.82.0",
22-
"@types/leaflet": "^1.9.20",
2323
"axios": "^1.10.0",
2424
"i18next": "^25.3.2",
2525
"i18next-browser-languagedetector": "^8.2.0",
@@ -36,6 +36,7 @@
3636
"@eslint/js": "^9.30.1",
3737
"@testing-library/jest-dom": "^6.6.3",
3838
"@testing-library/react": "^16.3.0",
39+
"@types/leaflet": "^1.9.20",
3940
"@types/react": "^19.1.8",
4041
"@types/react-dom": "^19.1.6",
4142
"@typescript-eslint/eslint-plugin": "^8.36.0",

pnpm-lock.yaml

Lines changed: 15 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/App.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import '@fontsource/roboto/300.css';
2-
import '@fontsource/roboto/400.css';
3-
import '@fontsource/roboto/500.css';
4-
import '@fontsource/roboto/700.css';
1+
import '@fontsource/open-sans/300.css';
2+
import '@fontsource/open-sans/400.css';
3+
import '@fontsource/open-sans/500.css';
4+
import '@fontsource/open-sans/700.css';
5+
import '@fontsource/open-sans-condensed/700.css';
56
import './i18n';
67

78
import { Box } from '@mui/material';

src/components/Alerts/AlertDetails/AlertImages.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export const AlertImages = ({ sequence }: AlertImagesType) => {
4343
minHeight={35}
4444
>
4545
<Grid>
46-
<Typography variant="h4">
46+
<Typography variant="h2">
4747
{formatToTime(sequence.startedAt)}
4848
</Typography>
4949
</Grid>

src/components/Alerts/AlertDetails/AlertInfos.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export const AlertInfos = ({ sequence, sequences }: AlertInfosType) => {
3030
>
3131
<Grid container direction="column" spacing={2} height="100%">
3232
<Grid minHeight={35} container alignItems="center">
33-
<Typography variant="h4">{t('titleDetails')}</Typography>
33+
<Typography variant="h2">{t('titleDetails')}</Typography>
3434
</Grid>
3535

3636
<Divider

src/components/Alerts/AlertDetails/AlertInfosSection.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ export const AlertInfosSection = ({
1212
const theme = useTheme();
1313
return (
1414
<Paper sx={{ padding: 1 }}>
15-
<Typography fontSize="0.85rem">{title}</Typography>
15+
<Typography variant="h4" fontSize="0.85rem">
16+
{title}
17+
</Typography>
1618
<Typography fontSize="0.85rem" color={theme.palette.secondaryText.main}>
1719
{children}
1820
</Typography>

src/components/Alerts/AlertsList/AlertCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export const AlertCard = ({ isActive, setActive, alert }: AlertCardType) => {
5858
marginBottom={1}
5959
>
6060
<VideocamOutlinedIcon fontSize="small" />
61-
<Typography variant="h4">{t('prefixCardDetection')}</Typography>
61+
<Typography variant="h3">{t('prefixCardDetection')}</Typography>
6262
</Stack>
6363
{alert.sequences.map((sequence) => (
6464
<Grid

src/components/Alerts/AlertsList/AlertsList.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ export const AlertsList = ({
2020

2121
return (
2222
<Grid direction="column" bgcolor={theme.palette.customBackground.light}>
23-
<Grid minHeight="55px" sx={{ padding: 1, paddingTop: 2 }}>
24-
<Typography variant="h3">
23+
<Grid minHeight="55px" padding={{ xs: 1, sm: 2 }} alignContent="center">
24+
<Typography variant="h2">
2525
{`${alerts.length.toString()} ${alerts.length <= 1 ? t('titleListSimple') : t('titleListPlural')}`}
2626
</Typography>
2727
</Grid>
2828
<Divider orientation="horizontal" flexItem />
2929
<Grid
3030
sx={{
31-
padding: '1rem',
31+
padding: { xs: 1, sm: 2 },
3232
overflowY: 'auto',
3333
height: 'calc(100vh - 64px - 55px)', // To get scroll on the alert cards list only (= 100% - topbar height - title height)
3434
}}

src/theme.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,20 @@ export const theme = createTheme({
4040
},
4141
},
4242
typography: {
43+
fontFamily: 'Open Sans',
4344
h1: {
4445
fontWeight: 700,
4546
fontSize: '1.5rem',
47+
fontFamily: 'Open Sans Condensed',
4648
},
47-
h3: {
48-
fontWeight: 500,
49+
h2: {
50+
fontWeight: 700,
4951
fontSize: '1.3rem',
52+
fontFamily: 'Open Sans Condensed',
53+
},
54+
h3: {
55+
fontWeight: 600,
56+
fontSize: '1rem',
5057
},
5158
h4: {
5259
fontWeight: 500,

0 commit comments

Comments
 (0)