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

chore(storefront): Update storefront to use the Altinn CDN for Inter font #809

Merged
merged 2 commits into from
Sep 13, 2023
Merged

chore(storefront): Update storefront to use the Altinn CDN for Inter font #809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3825ad
use altinn cdn inter font
Magnusrm Sep 12, 2023
1450640
set font-family on root
Magnusrm Sep 12, 2023
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
4 changes: 4 additions & 0 deletions storefront/components/Meta/Meta.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ const Meta = ({ title, description }: MetaProps) => {
name='viewport'
content='width=device-width, initial-scale=1'
/>
<link
rel='stylesheet'
href='https://altinncdn.no/fonts/inter/inter.css'
/>
<link
rel='shortcut icon'
href='/favicon.ico'
Expand Down
1 change: 1 addition & 0 deletions storefront/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ h6 {
min-height: calc(100vh);
overflow: hidden;
position: relative;
font-family: 'Inter', sans-serif;
}

.root > main {
Expand Down
1 change: 0 additions & 1 deletion storefront/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"@mdx-js/loader": "^2.0.0-rc.2",
"@mdx-js/react": "^1.6.22",
"@navikt/aksel-icons": "^2.8.4",
"@next/font": "13.0.7",
"@reach/disclosure": "^0.18.0",
"@tanstack/react-query": "^4.29.5",
"@tippyjs/react": "^4.2.6",
Expand Down
11 changes: 1 addition & 10 deletions storefront/pages/_app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,20 @@ import 'tippy.js/dist/tippy.css';
import '@altinn/figma-design-tokens/dist/tokens.css';
import '@digdir/design-system-tokens/brand/digdir/tokens.css';
import '../globals.css';
import { Inter } from '@next/font/google';
import type { AppProps } from 'next/app';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import cn from 'classnames';
import { Analytics } from '@vercel/analytics/react';

import { Header } from '../components/Header/Header';
import { Footer } from '../components/Footer/Footer';
import { JumpToMain } from '../components/JumpToMain';

const inter = Inter({
weight: ['400', '500', '600', '700'],
style: ['normal'],
subsets: ['latin'],
display: 'fallback',
});

const queryClient = new QueryClient();

const MyApp = ({ Component, pageProps }: AppProps) => {
return (
<QueryClientProvider client={queryClient}>
<div className={cn(inter.className, 'root')}>
<div className={'root'}>
<JumpToMain />
<Header />
<Component {...pageProps} />
Expand Down
8 changes: 0 additions & 8 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4891,13 +4891,6 @@ __metadata:
languageName: node
linkType: hard

"@next/font@npm:13.0.7":
version: 13.0.7
resolution: "@next/font@npm:13.0.7"
checksum: 88324e483561ed1372b97d434b98cff3c3adfeafc4217b45ff96f429c42ea4c6eebb089b34d8ef353aaf6413aa5f6d918a2ea83701ad129d2cc6f6751184d82a
languageName: node
linkType: hard

"@next/swc-darwin-arm64@npm:13.4.7":
version: 13.4.7
resolution: "@next/swc-darwin-arm64@npm:13.4.7"
Expand Down Expand Up @@ -22142,7 +22135,6 @@ __metadata:
"@mdx-js/loader": ^2.0.0-rc.2
"@mdx-js/react": ^1.6.22
"@navikt/aksel-icons": ^2.8.4
"@next/font": 13.0.7
"@reach/disclosure": ^0.18.0
"@tanstack/react-query": ^4.29.5
"@tippyjs/react": ^4.2.6
Expand Down
Loading