diff --git a/pkg/view/src/layouts/RootLayout.tsx b/pkg/view/src/layouts/RootLayout.tsx index a9c8c28..9d28731 100644 --- a/pkg/view/src/layouts/RootLayout.tsx +++ b/pkg/view/src/layouts/RootLayout.tsx @@ -1,8 +1,8 @@ import Navbar from "./shared/Navbar.tsx"; import { readProfiles, useUserinfo } from "../stores/userinfo.tsx"; -import { createEffect, createSignal, Show } from "solid-js"; +import { createEffect, createMemo, createSignal, Show } from "solid-js"; import { readWellKnown } from "../stores/wellKnown.tsx"; -import { BeforeLeaveEventArgs, useLocation, useNavigate } from "@solidjs/router"; +import { BeforeLeaveEventArgs, useLocation, useNavigate, useSearchParams } from "@solidjs/router"; export default function RootLayout(props: any) { const [ready, setReady] = createSignal(false); @@ -13,6 +13,7 @@ export default function RootLayout(props: any) { const userinfo = useUserinfo(); const location = useLocation(); + const [searchParams] = useSearchParams(); createEffect(() => { if (ready()) { @@ -30,6 +31,14 @@ export default function RootLayout(props: any) { } } + const mainContentStyles = createMemo(() => { + if (searchParams["embedded"]) { + return "h-screen"; + } else { + return "h-[calc(100vh-64px)] mt-[64px]"; + } + }); + return ( @@ -38,8 +47,11 @@ export default function RootLayout(props: any) { }> - -
{props.children}
+ + + + +
{props.children}
); } \ No newline at end of file diff --git a/pkg/view/src/pages/auth/callback.tsx b/pkg/view/src/pages/auth/callback.tsx index 5caf411..a682c66 100644 --- a/pkg/view/src/pages/auth/callback.tsx +++ b/pkg/view/src/pages/auth/callback.tsx @@ -4,8 +4,8 @@ export default function DefaultCallbackPage() { const [searchParams] = useSearchParams(); return ( -
-
+
+