Skip to content

Commit

Permalink
New font Commissioner
Browse files Browse the repository at this point in the history
  • Loading branch information
RalitsaIlieva committed Oct 12, 2023
1 parent abef9dc commit 4240b03
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 2 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ Watch releases of this repository to be notified about future updates:
## Contributors ✨

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->

[![All Contributors](https://img.shields.io/badge/all_contributors-73-orange.svg?style=flat-square)](#contributors-)

<!-- ALL-CONTRIBUTORS-BADGE:END -->

Please check [contributors guide](https://github.com/podkrepi-bg/frontend/blob/master/CONTRIBUTING.md) for:
Expand Down
17 changes: 15 additions & 2 deletions src/common/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@ import {
ThemeOptions,
} from '@mui/material/styles'

import { Commissioner } from 'next/font/google'
import { Montserrat } from 'next/font/google'

export const commissioner = Commissioner({
subsets: ['latin', 'cyrillic'],
})

export const montserrat = Montserrat({
display: 'auto',
subsets: ['latin', 'cyrillic'],
Expand Down Expand Up @@ -182,8 +187,16 @@ export const themeOptions: ThemeOptions = {
},

typography: {
fontFamily: montserrat.style.fontFamily,
h3: { color: colors.blue.dark },
fontFamily: commissioner.style.fontFamily,

h1: { fontFamily: montserrat.style.fontFamily },
h2: { fontFamily: montserrat.style.fontFamily },
h3: {
color: colors.blue.dark,
fontFamily: montserrat.style.fontFamily,
},
h4: { fontFamily: montserrat.style.fontFamily },
h5: { fontFamily: montserrat.style.fontFamily },

body1: {
fontSize: '0.875rem',
Expand Down
3 changes: 3 additions & 0 deletions src/components/client/campaigns/CampaignDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ const StyledGrid = styled(Grid)(({ theme }) => ({
paddingLeft: '0',
paddingRight: '0',
},
['& .ql-container']: {
fontFamily: theme.typography.fontFamily,
},

[`& .${classes.linkButton}`]: {
fontSize: theme.typography.pxToRem(10),
Expand Down
4 changes: 4 additions & 0 deletions src/components/client/campaigns/CampaignNewsSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@ const StyledTimeline = styled(Timeline)(({ theme }) => ({
fontStyle: 'normal',
padding: 0,
},

['& .ql-container']: {
fontFamily: theme.typography.fontFamily,
},
}))

type Props = {
Expand Down

0 comments on commit 4240b03

Please sign in to comment.