mirror of
https://github.com/prowler-cloud/prowler.git
synced 2026-07-24 13:01:56 +00:00
fix: resolve merge conflicts in SidebarWrap component
This commit is contained in:
@@ -42,12 +42,10 @@ export default function RootLayout({
|
||||
fontSans.variable,
|
||||
)}
|
||||
>
|
||||
<Providers themeProps={{ attribute: "class", defaultTheme: "light" }}>
|
||||
<Providers themeProps={{ attribute: "class", defaultTheme: "dark" }}>
|
||||
<div className="flex items-center h-dvh w-full justify-center overflow-hidden">
|
||||
<SidebarWrap />
|
||||
<main className="h-full w-full flex-1 flex-col p-4 overflow-y-scroll">
|
||||
{children}
|
||||
</main>
|
||||
<main className="w-full flex-1 flex-col p-4">{children}</main>
|
||||
</div>
|
||||
</Providers>
|
||||
</body>
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
Django==5.0.6
|
||||
djangorestframework==3.15.1
|
||||
Django==5.0.7
|
||||
djangorestframework==3.15.2
|
||||
django-cors-headers==4.3.1
|
||||
|
||||
Reference in New Issue
Block a user