Merge branch 'staging'

bombies · Nov 8, 2023 · ce6f82e · ce6f82e
2 parents a3aef3c + 4ab0d32
commit ce6f82e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/src/app/(site)/(internal)/dashboard/layout.tsx b/src/app/(site)/(internal)/dashboard/layout.tsx
@@ -25,7 +25,7 @@ const DashboardLayout: FC<PropsWithChildren> = ({children}) => {
                 priority
                 src="/images/mesh-bg.png"
                 alt=''
-                className="!absolute w-full h-full top-0 left-0 opacity-10 z-[1] pointer-events-none"
+                className="!fixed w-full h-full top-0 left-0 opacity-10 z-[1] pointer-events-none"
                 fill
                 style={{
                     objectFit: "cover"

diff --git a/src/app/(site)/(internal)/settings/layout.tsx b/src/app/(site)/(internal)/settings/layout.tsx
@@ -1,6 +1,7 @@
 import {Metadata} from "next";
-import {FC, PropsWithChildren} from "react";
+import React, {FC, PropsWithChildren} from "react";
 import SettingsSidebar from "@/app/(site)/(internal)/settings/components/SettingsSidebar";
+import Image from "next/image";
 
 export const metadata: Metadata = {
     title: 'Dream Logger - Settings',
@@ -9,12 +10,24 @@ export const metadata: Metadata = {
 
 const SettingsLayout: FC<PropsWithChildren> = ({children}) => {
     return (
-        <main className="relative flex min-h-screen">
-            <SettingsSidebar />
-            <div
-                className="flex-grow py-32 w-screen overflow-hidden phone:pt-32 flex flex-col phone:items-center phone-min:ml-16 tablet-min:ml-32">
-                {children}
+        <main className="min-h-screen">
+            <div className="z-10 relative flex">
+                <SettingsSidebar/>
+                <div
+                    className="flex-grow py-32 w-screen overflow-hidden phone:pt-32 flex flex-col phone:items-center phone-min:ml-16 tablet-min:ml-32">
+                    {children}
+                </div>
             </div>
+            <Image
+                priority
+                src="/images/mesh-bg.png"
+                alt=''
+                className="!fixed !w-full !h-full top-0 left-0 opacity-10 z-[1] pointer-events-none"
+                fill
+                style={{
+                    objectFit: "cover"
+                }}
+            />
         </main>
     )
 }

diff --git a/src/app/(site)/components/Footer.tsx b/src/app/(site)/components/Footer.tsx
@@ -9,7 +9,7 @@ const Footer: FC = () => {
     const pathName = usePathname();
 
     return !["/signin", "/resetpassword"].some(word => pathName.includes(word)) && (
-        <footer className="bg-[#08000F] p-20 flex justify-between phone:flex-col phone:items-center">
+        <footer className="bg-[#08000F] p-20 flex justify-between phone:flex-col phone:items-center !z-[2]">
             <div>
                 <Image
                     className="phone:flex phone:justify-center"

diff --git a/src/app/(site)/components/sidebar/Sidebar.tsx b/src/app/(site)/components/sidebar/Sidebar.tsx
@@ -41,7 +41,7 @@ const Sidebar: FC<Props> = ({children, headerText}) => {
             ref={sidebarRef}
             className={clsx(
                 "relative bg-secondary/50 min-h-screen data-[isopen=true]:w-96 w-24 pt-12 px-2",
-                "z-[100] tablet:!bg-secondary/0 tablet:data-[isopen=true]:!bg-opacity-90 tablet:data-[isopen=true]:backdrop-blur-md tablet:w-16 data-[isopen=true]:tablet:w-72 tablet:fixed",
+                "z-[100] tablet:!bg-secondary/0 tablet:data-[isopen=true]:!bg-secondary/90 tablet:data-[isopen=true]:backdrop-blur-md tablet:w-16 data-[isopen=true]:tablet:w-72 tablet:fixed",
                 "phone:w-12 data-[isopen=true]:phone:w-64",
                 "data-[isopen=true]:p-6 flex flex-col data-[isopen=false]:items-center data-[isopen=false]:z-0"
             )}