feat: 弹窗兼容修改
This commit is contained in:
parent
b6c82e9bc9
commit
8c7d415ae7
@ -10,9 +10,11 @@ import { getLocale, getMessages } from 'next-intl/server';
|
|||||||
import { PublicEnvScript } from 'next-runtime-env';
|
import { PublicEnvScript } from 'next-runtime-env';
|
||||||
import { unstable_noStore as noStore } from 'next/cache';
|
import { unstable_noStore as noStore } from 'next/cache';
|
||||||
// import { Geist, Geist_Mono } from 'next/font/google';
|
// import { Geist, Geist_Mono } from 'next/font/google';
|
||||||
|
import { Inter } from 'next/font/google';
|
||||||
import { cookies } from 'next/headers';
|
import { cookies } from 'next/headers';
|
||||||
import NextTopLoader from 'nextjs-toploader';
|
import NextTopLoader from 'nextjs-toploader';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
const inter = Inter({ subsets: ['latin'] });
|
||||||
|
|
||||||
// const fontSans = Geist({
|
// const fontSans = Geist({
|
||||||
// subsets: ['latin'],
|
// subsets: ['latin'],
|
||||||
@ -112,7 +114,7 @@ export default async function RootLayout({
|
|||||||
<body
|
<body
|
||||||
suppressHydrationWarning
|
suppressHydrationWarning
|
||||||
// ${fontSans.variable} ${fontMono.variable}
|
// ${fontSans.variable} ${fontMono.variable}
|
||||||
className={`size-full min-h-[calc(100dvh-env(safe-area-inset-top))] font-sans antialiased`}
|
className={`size-full min-h-[calc(100dvh-env(safe-area-inset-top))] ${inter.className} antialiased`}
|
||||||
>
|
>
|
||||||
<NextIntlClientProvider messages={messages}>
|
<NextIntlClientProvider messages={messages}>
|
||||||
<NextTopLoader showSpinner={false} />
|
<NextTopLoader showSpinner={false} />
|
||||||
|
|||||||
@ -28,7 +28,7 @@ export function DatePicker({
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Popover>
|
<Popover modal>
|
||||||
<PopoverTrigger asChild>
|
<PopoverTrigger asChild>
|
||||||
<Button
|
<Button
|
||||||
variant='outline'
|
variant='outline'
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user