development/7190e8d1-f60c-4207-b927-67fb4121f770
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: development:version_2
Branches Tags
development:main development:version_3 development:version_2 development:version_1
...
pull from: development:main
Branches Tags
development:main development:version_3 development:version_2 development:version_1

23 Commits
version_2 ... main

Author SHA1 Message Date
development
f0ec12fb4b Merge version_3 into main 
Merge version_3 into main
 2026-02-09 13:09:05 +00:00
development
5d3998d9c9 Update theme fonts 2026-02-09 13:09:00 +00:00
development
69a1fc96f2 Update theme fonts 2026-02-09 13:08:59 +00:00
development
73b43246c7 Merge version_3 into main 
Merge version_3 into main
 2026-02-09 13:00:34 +00:00
development
a46593c9c5 Update theme fonts 2026-02-09 13:00:29 +00:00
development
013f6dbc4a Update theme fonts 2026-02-09 13:00:28 +00:00
development
223efb2a3c Merge version_3 into main 
Merge version_3 into main
 2026-02-09 12:50:47 +00:00
development
b0fc442d12 Update theme fonts 2026-02-09 12:50:43 +00:00
development
a9593a9928 Update theme fonts 2026-02-09 12:50:42 +00:00
development
304b9c3845 Merge version_3 into main 
Merge version_3 into main
 2026-02-09 12:45:11 +00:00
development
1db4d730ef Update theme fonts 2026-02-09 12:45:06 +00:00
development
a07a665123 Update theme fonts 2026-02-09 12:45:05 +00:00
development
689043ac8d Merge version_3 into main 
Merge version_3 into main
 2026-02-09 12:39:15 +00:00
development
19ae9bf2d8 Update theme fonts 2026-02-09 12:39:10 +00:00
development
37180a1b9e Update theme fonts 2026-02-09 12:39:09 +00:00
development
a25a64f866 Merge version_3 into main 
Merge version_3 into main
 2026-02-09 12:33:27 +00:00
development
5ebfa1aeb8 Update theme fonts 2026-02-09 12:33:22 +00:00
development
dc16afff9b Update theme fonts 2026-02-09 12:33:22 +00:00
development
0ec0d4c638 Merge version_3 into main 
Merge version_3 into main
 2026-02-06 11:38:45 +00:00
development
fbcba7d86d Update src/app/styles/base.css 2026-02-06 11:38:40 +00:00
development
4492331c0c Update src/app/layout.tsx 2026-02-06 11:38:39 +00:00
development
c750cdfee4 Merge version_2 into main 
Merge version_2 into main
 2026-02-06 11:19:34 +00:00
development
2471296fa6 Merge version_1 into main 
Merge version_1 into main
 2026-02-06 11:15:43 +00:00
2 changed files with 61 additions and 8 deletions
Expand all files Collapse all files

65
src/app/layout.tsx
View File

@@ -1,11 +1,12 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Work_Sans } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper"; import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
import { Montserrat } from "next/font/google";
import { Inter } from "next/font/google";
const workSans = Work_Sans({ const montserrat = Montserrat({
variable: "--font-work-sans", subsets: ["latin"], variable: "--font-montserrat", subsets: ["latin"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -29,6 +30,60 @@ export const metadata: Metadata = {
} }
}; };
const notoSans = Noto_Sans({
variable: "--font-noto-sans",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const workSans = Work_Sans({
variable: "--font-work-sans",
subsets: ["latin"],
});
const sourceSans3 = Source_Sans_3({
variable: "--font-source-sans-3",
subsets: ["latin"],
});
const publicSans = Public_Sans({
variable: "--font-public-sans",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const mulish = Mulish({
variable: "--font-mulish",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const manrope = Manrope({
variable: "--font-manrope",
subsets: ["latin"],
});
const dmSans = DM_Sans({
variable: "--font-dm-sans",
subsets: ["latin"],
});
const montserrat = Montserrat({
variable: "--font-montserrat",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({ export default function RootLayout({
children, children,
}: Readonly<{ }: Readonly<{
@@ -37,9 +92,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body ${inter.variable} antialiased`} ${sourceSans3.variable} {notoSans.variable`} {inter.variable}} antialiased`} className={`${montserrat.variable} ${inter.variable} antialiased`}>
className={`${workSans.variable} antialiased`}
>
<Tag /> <Tag />
{children} {children}

4
src/app/styles/base.css
View File

@@ -11,7 +11,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-work-sans), sans-serif; font-family: var(--font-inter), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-work-sans), sans-serif; font-family: var(--font-montserrat), sans-serif;
} }