Skip to content

Commit

Permalink
Merge pull request #1003 from gchq/dev/update-bailo-header-font
Browse files Browse the repository at this point in the history
added pacifico as an npm import
  • Loading branch information
ARADDCC002 authored Jan 12, 2024
2 parents 05a8865 + 3793f3f commit 8cc441d
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
11 changes: 11 additions & 0 deletions frontend/package-lock.json

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

1 change: 1 addition & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"@emotion/react": "^11.11.0",
"@emotion/server": "^11.11.0",
"@emotion/styled": "^11.11.0",
"@fontsource/pacifico": "^5.0.8",
"@mdx-js/loader": "^2.3.0",
"@mdx-js/react": "^2.3.0",
"@mui/icons-material": "^5.11.16",
Expand Down
7 changes: 3 additions & 4 deletions frontend/src/wrapper/TopNavigation.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import '@fontsource/pacifico'

import { Add, Settings } from '@mui/icons-material'
import DarkModeIcon from '@mui/icons-material/DarkMode'
import LogoutIcon from '@mui/icons-material/Logout'
Expand All @@ -18,7 +20,6 @@ import {
} from '@mui/material'
import MuiAppBar, { AppBarProps as MuiAppBarProps } from '@mui/material/AppBar'
import { styled, useTheme } from '@mui/material/styles'
import { Pacifico } from 'next/font/google'
import { useRouter } from 'next/router'
import { CSSProperties, MouseEvent, useContext, useState } from 'react'

Expand Down Expand Up @@ -59,8 +60,6 @@ const AppBar = styled(MuiAppBar, {
}),
}))

const pacifico = Pacifico({ subsets: ['latin'], weight: '400' })

// This is currently only being used by the beta wrapper
export default function TopNavigation({
drawerOpen = false,
Expand Down Expand Up @@ -128,7 +127,7 @@ export default function TopNavigation({
<Box sx={{ width: 'max-content', cursor: 'pointer', px: 1 }}>
<Link href='/beta' color='inherit' underline='none' style={{ color: 'inherit', textDecoration: 'inherit' }}>
<Typography variant='h5' component='div'>
<span className={pacifico.className}>Bailo</span>
<span style={{ fontFamily: 'Pacifico' }}>Bailo</span>
{betaAdornment}
</Typography>
</Link>
Expand Down

0 comments on commit 8cc441d

Please sign in to comment.