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.

Sign up for GitHub

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

added pacifico as an npm import #1003

Merged
merged 1 commit into from
Jan 12, 2024
Merged

added pacifico as an npm import #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions frontend/package-lock.json
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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