diff --git a/src/app/globals.css b/src/app/globals.css index 211731c..3edc26d 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -13,6 +13,8 @@ --color-foreground: #333333; --color-disabled: #E7E7E7; --color-disabled-text: #8C90A3; + --color-menu-header: #C3C7DD; + --color-icon-deactive: #A8ABBF; --radius-normal: 10px; --text-sm2: 13px; --text-xs2: 10px; diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 01ca00a..634c0f6 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -16,6 +16,7 @@ export default function RootLayout({
{children} diff --git a/src/app/loading.tsx b/src/app/loading.tsx index 49906a7..a21843d 100644 --- a/src/app/loading.tsx +++ b/src/app/loading.tsx @@ -1,4 +1,4 @@ -import LoadingOverlay from '@/components/loading/LoadingOverlay' +import LoadingOverlay from '@/components/overlays/LoadingOverlay' import React from 'react' function Loading() { diff --git a/src/app/menu/layout.tsx b/src/app/menu/layout.tsx index b92855f..21d28ed 100644 --- a/src/app/menu/layout.tsx +++ b/src/app/menu/layout.tsx @@ -1,5 +1,6 @@ import BottomNavBar from "@/components/navigation/BottomNavBar"; import { ReactQueryProvider } from "@/components/providers/ReactQueryProvider"; +import { Menu } from '@/components/menu/Menu'; export const metadata = { title: 'Menu', @@ -13,10 +14,17 @@ export default function MenuLayout({ return (