|
|
@@ -3,12 +3,11 @@ import React, { ReactElement, ReactNode, useEffect } from 'react';
|
|
|
import { NextPage } from 'next';
|
|
|
import { appWithTranslation } from 'next-i18next';
|
|
|
import { AppProps } from 'next/app';
|
|
|
-import { Lato } from 'next/font/google';
|
|
|
-import localFont from 'next/font/local';
|
|
|
import { SWRConfig } from 'swr';
|
|
|
|
|
|
import * as nextI18nConfig from '^/config/next-i18next.config';
|
|
|
|
|
|
+import { GlobalFonts } from '~/components/FontFamily/GlobalFonts';
|
|
|
import { useI18nextHMR } from '~/services/i18next-hmr';
|
|
|
import {
|
|
|
useAppTitle, useConfidential, useGrowiVersion, useSiteUrl, useIsDefaultLogo, useForcedColorScheme,
|
|
|
@@ -25,22 +24,6 @@ import '~/styles/style-app.scss';
|
|
|
|
|
|
const isDev = process.env.NODE_ENV === 'development';
|
|
|
|
|
|
-// define fonts
|
|
|
-const lato = Lato({
|
|
|
- weight: ['400', '700'],
|
|
|
- style: ['normal', 'italic'],
|
|
|
- subsets: ['latin'],
|
|
|
- display: 'swap',
|
|
|
-});
|
|
|
-const sourceHanCodeJPSubsetMain = localFont({
|
|
|
- src: '../../resource/fonts/SourceHanCodeJP-Regular-subset-main.woff2',
|
|
|
- display: 'optional',
|
|
|
-});
|
|
|
-const sourceHanCodeJPSubsetJis2 = localFont({
|
|
|
- src: '../../resource/fonts/SourceHanCodeJP-Regular-subset-jis2.woff2',
|
|
|
- display: 'optional',
|
|
|
-});
|
|
|
-
|
|
|
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
|
export type NextPageWithLayout<P = {}, IP = P> = NextPage<P, IP> & {
|
|
|
getLayout?: (page: ReactElement) => ReactNode,
|
|
|
@@ -74,14 +57,7 @@ function GrowiApp({ Component, pageProps }: GrowiAppProps): JSX.Element {
|
|
|
|
|
|
return (
|
|
|
<>
|
|
|
- <style jsx global>{`
|
|
|
- :root {
|
|
|
- --font-family-sans-serif: ${lato.style.fontFamily}, -apple-system, BlinkMacSystemFont, 'Hiragino Kaku Gothic ProN', Meiryo, sans-serif;
|
|
|
- --font-family-serif: Georgia, 'Times New Roman', Times, serif;
|
|
|
- --font-family-monospace: monospace, ${sourceHanCodeJPSubsetMain.style.fontFamily}, ${sourceHanCodeJPSubsetJis2.style.fontFamily};
|
|
|
- }
|
|
|
- `}
|
|
|
- </style>
|
|
|
+ <GlobalFonts />
|
|
|
<SWRConfig value={swrGlobalConfiguration}>
|
|
|
{getLayout(<Component {...pageProps} />)}
|
|
|
</SWRConfig>
|