Ryan/documenso
1
0
Fork 1
mirror of https://github.com/documenso/documenso.git synced 2025-11-25 14:11:43 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge conflicts

Browse Source
This commit is contained in:
Ephraim Atta-Duncan
2025-05-28 00:36:27 +00:00
parent c4cb6eeb94 93aece9644
commit 4fc4a8ba7f
237 changed files with 25580 additions and 15241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/remix/app/routes/_recipient+/d.$token+/_index.tsx
View File

@ -60,7 +60,10 @@ export async function loader({ params, request }: Route.LoaderArgs) {
return superLoaderJson({
isAccessAuthValid: true,
template,
template: {
...template,
folder: null,
},
directTemplateRecipient,
} as const);
}

2
apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx
View File

@ -119,7 +119,7 @@ export default function CompletedSigningPage({ loaderData }: Route.ComponentProp
return (
<div
className={cn(
'-mx-4 flex flex-col items-center overflow-x-hidden px-4 pt-24 md:-mx-8 md:px-8 lg:pt-36 xl:pt-44',
'-mx-4 flex flex-col items-center overflow-hidden px-4 pt-24 md:-mx-8 md:px-8 lg:pt-36 xl:pt-44',
{ 'pt-0 lg:pt-0 xl:pt-0': canSignUp },
)}
>