mirror of
https://github.com/umami-software/umami.git
synced 2026-02-16 02:25:35 +01:00
Replace fontsource with next/font/google and update react-zen.
Some checks are pending
Node.js CI / build (push) Waiting to run
Some checks are pending
Node.js CI / build (push) Waiting to run
- Switch from @fontsource/inter to next/font/google for font loading - Update @umami/react-zen to v0.229.0 - Add type augmentation for react-zen missing children props - Move global.css to app directory Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
parent
6367d94552
commit
30c45f888f
8 changed files with 107 additions and 2162 deletions
20
src/app/global.css
Normal file
20
src/app/global.css
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
html,
|
||||
body {
|
||||
font-family: var(--font-family), sans-serif;
|
||||
color: var(--text-base);
|
||||
font-size: 14px;
|
||||
background-color: var(--surface-raised);
|
||||
width: 100%;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
html[style*="padding-right"] {
|
||||
padding-right: 0 !important;
|
||||
}
|
||||
|
||||
a,
|
||||
a:active,
|
||||
a:hover {
|
||||
color: var(--text-base);
|
||||
text-decoration: none;
|
||||
}
|
||||
|
|
@ -1,13 +1,15 @@
|
|||
import type { Metadata } from 'next';
|
||||
import { Inter } from 'next/font/google';
|
||||
import { Suspense } from 'react';
|
||||
import { Providers } from './Providers';
|
||||
import '@fontsource/inter/300.css';
|
||||
import '@fontsource/inter/400.css';
|
||||
import '@fontsource/inter/500.css';
|
||||
import '@fontsource/inter/700.css';
|
||||
import '@umami/react-zen/styles.css';
|
||||
import '@/styles/global.css';
|
||||
import '@/styles/variables.css';
|
||||
import './global.css';
|
||||
import '@umami/react-zen/styles.full.css';
|
||||
|
||||
const inter = Inter({
|
||||
subsets: ['latin'],
|
||||
display: 'swap',
|
||||
variable: '--font-inter',
|
||||
});
|
||||
|
||||
export default function ({ children }) {
|
||||
if (process.env.DISABLE_UI) {
|
||||
|
|
@ -19,7 +21,7 @@ export default function ({ children }) {
|
|||
}
|
||||
|
||||
return (
|
||||
<html lang="en">
|
||||
<html lang="en" className={`${inter.className} ${inter.variable}`}>
|
||||
<head>
|
||||
<link rel="icon" href="/favicon.ico" />
|
||||
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue