diff options
| author | Maze <167211895+mazeincoding@users.noreply.github.com> | 2025-07-17 13:02:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-17 13:02:30 +0200 |
| commit | 9bf5ce399c98911338f47c89c31992e7e91a848d (patch) | |
| tree | 48bd51992b723eca50803f36071cb43b21863126 /apps/web/src/components/editor/timeline-track.tsx | |
| parent | 7d4cbca1190edc12ff9ae17029613b77b08436e0 (diff) | |
| parent | 167f366c6d791dfc054d64f50e83828960668e55 (diff) | |
| download | opencut-9bf5ce399c98911338f47c89c31992e7e91a848d.tar.gz | |
Merge pull request #324 from simonorzel26/feat/refactor-timeline
feat(web): timeline refactor and horizontal + vertical scrolling
Diffstat (limited to 'apps/web/src/components/editor/timeline-track.tsx')
| -rw-r--r-- | apps/web/src/components/editor/timeline-track.tsx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/apps/web/src/components/editor/timeline-track.tsx b/apps/web/src/components/editor/timeline-track.tsx index 91b3ffa3..48913410 100644 --- a/apps/web/src/components/editor/timeline-track.tsx +++ b/apps/web/src/components/editor/timeline-track.tsx @@ -1015,12 +1015,12 @@ export function TimelineTrackContent({ > {track.elements.length === 0 ? ( <div - className={`h-full w-full rounded-sm border-2 border-dashed flex items-center justify-center text-xs text-muted-foreground transition-colors ${ + className={`h-full w-full border-inset border-b border-dashed flex items-center justify-center text-xs text-muted-foreground transition-colors ${ isDropping ? wouldOverlap - ? "border-red-500 bg-red-500/10 text-red-600" - : "border-blue-500 bg-blue-500/10 text-blue-600" - : "border-muted/30" + ? "rounded-sm border-red-500 bg-red-500/10 text-red-600" + : "rounded-sm border-blue-500 bg-blue-500/10 text-blue-600" + : "border-background" }`} > {isDropping @@ -1030,7 +1030,9 @@ export function TimelineTrackContent({ : ""} </div> ) : ( - <> + <div + className={`h-full w-full border-b border-dashed border-background flex items-center justify-center text-xs text-muted-foreground transition-colors`} + > {track.elements.map((element) => { const isSelected = selectedElements.some( (c) => c.trackId === track.id && c.elementId === element.id @@ -1089,7 +1091,7 @@ export function TimelineTrackContent({ /> ); })} - </> + </div> )} </div> </div> |
