Merge branch 'pr/daidr/324' into dev

src/components/dashboard/DashboardLayout.tsx

@@ -349,7 +349,7 @@ export function DashboardLayout({
             </DashboardSidebar>
           )}
 
-          <div className={`${isMobileLayout ? "pt-16" : "flex-1"}`}>
+          <div className={`${isMobileLayout ? "pt-16 flex-1" : "flex-1"}`}>
             {children}
           </div>
         </div>

src/components/dashboard/DashboardMain.tsx

@@ -12,7 +12,7 @@ export const DashboardMain: React.FC<{
   const isMobileLayout = useMobileLayout()
 
   return (
-    <div className="flex-1 overflow-scroll">
+    <div className="flex-1">
       <div
         className={cn(
           fullWidth ? "relative" : "min-w-[270px] relative px-5 py-5 md:px-10",

src/components/dashboard/DashboardSidebar.tsx

@@ -23,19 +23,25 @@ export const DashboardSidebar: React.FC<{
     <div
       className={`${
         isOpen ? `w-sidebar` : "w-20"
-      } relative bg-slate-50 z-10 h-full transition-all flex flex-col`}
+      } transition-[width] relative flex-shrink-0`}
     >
-      {children(isOpen)}
-      <div className="w-[1px] bg-border absolute top-0 right-0 bottom-0"></div>
       <div
-        className="absolute top-5 -right-3 bg-accent rounded-full cursor-pointer text-white w-6 h-6"
-        onClick={() => setIsOpen(!isOpen)}
+        className={`${
+          isOpen ? `w-sidebar` : "w-20"
+        } transition-[width] fixed bg-slate-50 z-10 h-full flex flex-col`}
       >
-        {isOpen ? (
-          <i className="i-mingcute:left-line text-2xl inline-block w-6 h-6" />
-        ) : (
-          <i className="i-mingcute:right-line text-2xl inline-block w-6 h-6" />
-        )}
+        {children(isOpen)}
+        <div className="w-[1px] bg-border absolute top-0 right-0 bottom-0"></div>
+        <div
+          className="absolute top-5 -right-3 bg-accent rounded-full cursor-pointer text-white w-6 h-6"
+          onClick={() => setIsOpen(!isOpen)}
+        >
+          {isOpen ? (
+            <i className="i-mingcute:left-line text-2xl inline-block w-6 h-6" />
+          ) : (
+            <i className="i-mingcute:right-line text-2xl inline-block w-6 h-6" />
+          )}
+        </div>
       </div>
     </div>
   )

src/css/prose.css

@@ -106,7 +106,7 @@
 
 .prose .table-wrapper {
   @apply min-w-full rounded-xl text-sm my-7 whitespace-nowrap overflow-auto;
-  @apply shadow-sm ring-1 ring-zinc-700 ring-opacity-10;
+  @apply border border-border;
 }
 
 .prose table {

src/pages/dashboard/[subdomain]/index.tsx

@@ -74,7 +74,7 @@ export default function SubdomainIndex() {
   const showcaseSites = useGetSites(showcase)
 
   return (
-    <DashboardMain title="Dashboard">
+    <DashboardMain title="Dashboard" className="max-w-screen-2xl">
       <div className="min-w-[270px] flex flex-col xl:flex-row space-y-8 xl:space-y-0">
         <div className="flex-1 space-y-8">
           <div className="grid gap-4 sm:grid-cols-3 grid-cols-2">