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

とりあえずglobal.cssに追加 #62

Merged
merged 7 commits into from
Apr 9, 2024
+6 −5
Merged

とりあえずglobal.cssに追加 #62

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
298b1e9
とりあえずglobal.cssに追加
shigekk Mar 28, 2024
a25137e
Merge branch 'main' of https://github.com/saitamau-maximum/public-web…
shigekk Apr 4, 2024
8e71c71
NotoSansJPに変更
shigekk Apr 4, 2024
0b2df5d
src/app/layout.tsxでフォント設定
shigekk Apr 5, 2024
36669b9
japaneseをlatinに
shigekk Apr 5, 2024
1f5f924
フォーマット
shigekk Apr 5, 2024
b4d4495
Merge branch 'main' of https://github.com/saitamau-maximum/public-web…
shigekk Apr 5, 2024
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
3 changes: 0 additions & 3 deletions src/app/global.css
View file
Open in desktop
shigekk marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@400;700&display=swap');

body {
margin: 0;
font-family: 'Noto Sans JP', sans-serif;
}
9 changes: 7 additions & 2 deletions src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
import type { Metadata } from 'next';
import { Inter } from 'next/font/google';
import { Inter, GoogleFont } from 'next/font/google';
sor4chi marked this conversation as resolved.
Show resolved Hide resolved
import './global.css';
import { Header } from '../components/Header/Header';

const inter = Inter({ subsets: ['latin'] });

const notoSansJP = GoogleFont({
name: 'Noto Sans JP',
subsets: ['japanese'],
sor4chi marked this conversation as resolved.
Show resolved Hide resolved
});

export const metadata: Metadata = {
title: {
template: '%s | Maximum',
Expand All @@ -20,7 +25,7 @@ export default function RootLayout({
}>) {
return (
<html lang='ja'>
<body className={inter.className}>
<body className={`${inter.className} ${notoSansJP.className}`}>
<Header />
{children}
</body>
Expand Down