diff --git a/app/[lang]/layout.tsx b/app/[lang]/layout.tsx index 7da8ca05d..8a614ae75 100644 --- a/app/[lang]/layout.tsx +++ b/app/[lang]/layout.tsx @@ -1,7 +1,8 @@ import Navbar from 'components/layout/navbar'; -import { i18n } from 'i18n-config'; -import { Inter } from 'next/font/google'; +import { Locale, i18n } from 'i18n-config'; +import localFont from 'next/font/local'; import { ReactNode, Suspense } from 'react'; + import './globals.css'; const { TWITTER_CREATOR, TWITTER_SITE, SITE_NAME } = process.env; @@ -29,10 +30,27 @@ export const metadata = { }) }; -const inter = Inter({ - subsets: ['latin'], +// Font files can be colocated inside of `app` +const cinzel = localFont({ + src: '../fonts/Cinzel-Regular.ttf', display: 'swap', - variable: '--font-inter' + variable: '--font-cinzel' +}); + +const alpina = localFont({ + src: [ + { + path: '../fonts/GT-Alpina-Regular-Trial.woff2', + weight: '400', + style: 'normal' + }, + { + path: '../fonts/GT-Alpina-Bold-Trial.woff2', + weight: '700', + style: 'normal' + } + ], + variable: '--font-alpina' }); export async function generateStaticParams() { @@ -47,10 +65,10 @@ export default async function RootLayout({ params: { lang: string }; }) { return ( - +
- +
{children}
 diff --git a/app/[lang]/page.tsx b/app/[lang]/page.tsx index 361f5f8d3..b0af28e78 100644 --- a/app/[lang]/page.tsx +++ b/app/[lang]/page.tsx @@ -25,7 +25,7 @@ export default async function HomePage({ params: { lang } }: { params: { lang: L
-
+
narai by suginomori brewery - + +
+
); } diff --git a/components/grid/tile.tsx b/components/grid/tile.tsx index 9ec17e143..e1523f510 100644 --- a/components/grid/tile.tsx +++ b/components/grid/tile.tsx @@ -1,6 +1,5 @@ import clsx from 'clsx'; import Image from 'next/image'; -import Label from '../label'; export function GridTileImage({ isInteractive = true, @@ -27,9 +26,6 @@ export function GridTileImage({ {...props} /> ) : null} - {label ? ( -
); } diff --git a/middleware.ts b/middleware.ts index 0ae013132..971d276c8 100644 --- a/middleware.ts +++ b/middleware.ts @@ -28,9 +28,9 @@ export function middleware(request: NextRequest) { // If you have one if ( [ - '/public/addets/images/logo.png', - '/public/addets/images/logo+namemark.png', - '/public/addets/images/namemark.png' + '/public/assets/images/logo.png', + '/public/assets/images/logo+namemark.png', + '/public/assets/images/namemark.png' // Your other files in `public` ].includes(pathname) ) diff --git a/tailwind.config.js b/tailwind.config.js index e10732157..d896646b8 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -10,7 +10,11 @@ module.exports = { dark: '#212720' }, fontFamily: { - sans: ['var(--font-inter)'] + sans: ['var(--font-alpina)', 'sans-serif'], + title: ['var(--font-cinzel)', 'sans-serif'] + }, + aspectRatio: { + bottle: '0.7065217391' }, keyframes: { fadeIn: {