diff options
| author | enkeii64 <imenkei64@gmail.com> | 2025-08-04 17:59:44 +1000 |
|---|---|---|
| committer | enkeii64 <imenkei64@gmail.com> | 2025-08-04 17:59:44 +1000 |
| commit | bb36b2e439bffcaa7059e3c0578a0fc61c2737ac (patch) | |
| tree | 0ec518ba06337f7d37c81b7e9341d4380066c15e /apps/web/src/app | |
| parent | 3a6bc6ebf71475a19b9202061ab08f93d1a67b9f (diff) | |
| download | opencut-bb36b2e439bffcaa7059e3c0578a0fc61c2737ac.tar.gz | |
Fix merge conflicts
Diffstat (limited to 'apps/web/src/app')
| -rw-r--r-- | apps/web/src/app/editor/[project_id]/page.tsx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/web/src/app/editor/[project_id]/page.tsx b/apps/web/src/app/editor/[project_id]/page.tsx index f5e64a93..9e3d1b9e 100644 --- a/apps/web/src/app/editor/[project_id]/page.tsx +++ b/apps/web/src/app/editor/[project_id]/page.tsx @@ -155,7 +155,6 @@ export default function Editor() { <div className="h-screen w-screen flex flex-col bg-background overflow-hidden"> <EditorHeader /> <div className="flex-1 min-h-0 min-w-0"> - {activePreset === "media" ? ( <ResizablePanelGroup key={`media-${activePreset}-${resetCounter}`} @@ -301,7 +300,7 @@ export default function Editor() { minSize={15} maxSize={40} onResize={setPropertiesPanel} - className="min-w-0" + className="min-w-0 rounded-sm" > <PropertiesPanel /> </ResizablePanel> @@ -429,7 +428,7 @@ export default function Editor() { minSize={15} maxSize={40} onResize={setPropertiesPanel} - className="min-w-0" + className="min-w-0 rounded-sm" > <PropertiesPanel /> </ResizablePanel> |