diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 5dc1c667..1596de73 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -20,9 +20,9 @@ import SwrConfigClient from '../state/SwrConfigClient'; import AdminBatchEditPanel from '@/admin/AdminBatchEditPanel'; import ShareModals from '@/share/ShareModals'; -import '../site/globals.css'; -import '../site/sonner.css'; -import '../site/viewerjs.css'; +import '../../tailwind.css'; +import '../css/sonner.css'; +import '../css/viewerjs.css'; export const metadata: Metadata = { title: SITE_TITLE, diff --git a/src/site/sonner.css b/src/css/sonner.css similarity index 100% rename from src/site/sonner.css rename to src/css/sonner.css diff --git a/src/site/viewerjs.css b/src/css/viewerjs.css similarity index 100% rename from src/site/viewerjs.css rename to src/css/viewerjs.css diff --git a/src/utility/useIsDesktop.ts b/src/utility/useIsDesktop.ts index 0b67e96a..5f6963a2 100644 --- a/src/utility/useIsDesktop.ts +++ b/src/utility/useIsDesktop.ts @@ -1,15 +1,11 @@ -import resolveConfig from 'tailwindcss/resolveConfig'; -import tailwindConfig from '@/../tailwind.config'; import { useLayoutEffect, useState } from 'react'; -const screens = resolveConfig(tailwindConfig).theme?.screens as any; - export default function useIsDesktop() { const [isDesktop, setIsDesktop] = useState(false); useLayoutEffect(() => { if (typeof window !== 'undefined') { - const mql = window.matchMedia(`(min-width: ${screens.md})`); + const mql = window.matchMedia('(min-width: var(--breakpoint-md))'); setIsDesktop(mql.matches); const eventHandler = (event: MediaQueryListEvent) => { setIsDesktop(event.matches); diff --git a/src/site/globals.css b/tailwind.css similarity index 100% rename from src/site/globals.css rename to tailwind.css