commit cf9232d94b6f06fd837ce8bc353e29f4f4651291
parent e4df807a52d250280c20855897f195c4ed95f8ba
Author: Sunny <122193933+Sunny-JP@users.noreply.github.com>
Date: Mon, 26 Jan 2026 15:39:17 +0900
Merge pull request #26 from Sunny-JP/v4-sunny-dev
change font
Diffstat:
2 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/app/globals.css b/src/app/globals.css
@@ -32,7 +32,7 @@
--foreground: #ffffff;
--card: #151515;
--card-foreground: #ffffff;
- --primary: hsl(var(--tap-h) var(--tap-s) 92%);
+ --primary: hsl(var(--tap-h) var(--tap-s) 94%);
--primary-foreground: #333333;
--secondary: #ffffff;
--secondary-foreground: #aaaaaa;
@@ -89,7 +89,7 @@ header {
body {
background-color: var(--background);
color: var(--foreground);
- font-family: sans-serif;
+ font-family: var(--font-mandali), var(--font-kosugi), "Helvetica Neue", Arial, "Hiragino Kaku Gothic ProN", "Hiragino Sans", Meiryo, sans-serif;
font-weight: 700;
padding-bottom: calc(var(--bottom-nav-height) + env(safe-area-inset-bottom));
}
@@ -115,7 +115,7 @@ body {
padding-top: 14px;
padding-bottom: 14px;
text-align: center;
- font-size: 1.2rem;
+ font-size: 3.5cqw;
line-height: 1.25;
font-weight: 700;
color: var(--nav-foreground);
@@ -173,8 +173,8 @@ body {
font-weight: 700;
letter-spacing: 0.05em;
line-height: 1.1;
- margin-top: -1cqw;
- margin-bottom: 0.5cqw;
+ margin-top: -1.6cqw;
+ margin-bottom: 1.6cqw;
}
.countdown-text-s {
font-size: 8.5cqw;
@@ -282,11 +282,11 @@ body {
}
.cal-info {
- font-size: 1.35rem;
+ font-size: 6cqw;
font-weight: 700;
}
.cal-week {
- font-size: 1.1rem;
+ font-size: 3.5cqw;
font-weight: 700;
}
.cal-days {
@@ -306,7 +306,7 @@ body {
padding-top: 14px;
padding-bottom: 14px;
text-align: center;
- font-size: 1.2rem;
+ font-size: 4cqw;
line-height: 1.25;
font-weight: 700;
color: var(--secondary-foreground);
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,10 +1,19 @@
import type { Metadata, Viewport } from "next";
-import { Noto_Sans_JP } from "next/font/google";
+import { Mandali, Kosugi_Maru } from "next/font/google";
import "./globals.css";
import Providers from "./providers";
-const NotoSansJPFont400 = Noto_Sans_JP({ weight: "400", subsets: ["latin"] });
-const NotoSansJPFont700 = Noto_Sans_JP({ weight: "700", subsets: ["latin"] });
+const mandali = Mandali({
+ weight: "400",
+ subsets: ["latin"],
+ variable: "--font-mandali",
+});
+
+const kosugi = Kosugi_Maru({
+ weight: "400",
+ subsets: ["latin"],
+ variable: "--font-kosugi",
+});
export const metadata: Metadata = {
title: "Café Timer",
@@ -15,9 +24,6 @@ export const metadata: Metadata = {
statusBarStyle: "default",
title: "Café Timer",
},
- formatDetection: {
- telephone: false,
- },
};
export const viewport: Viewport = {
@@ -38,7 +44,7 @@ export default function RootLayout({
}>) {
return (
<html lang="ja" className="h-full">
- <body className={`${NotoSansJPFont700.className} ${NotoSansJPFont400.className} h-full`}>
+ <body className={`${mandali.variable} ${kosugi.variable} h-full`}>
<Providers>
{children}
</Providers>
