Skip to content

Open source CapCut alternative.

TypeScript

fix(site): frame light file tiles in the page border

David Lebe6c8a198af5
diff --git a/site/src/app/globals.css b/site/src/app/globals.css
index 1ee904c3..2c114838 100644
--- a/site/src/app/globals.css
+++ b/site/src/app/globals.css
@@ -27,6 +27,8 @@
--color-ring: var(--ring);
--color-input: var(--input);
--color-border: var(--border);
+ --color-page-border: var(--page-border);
+ --color-page-input: var(--page-input);
--color-destructive: var(--destructive);
--color-accent-foreground: var(--accent-foreground);
--color-accent: var(--accent);
@@ -134,6 +136,13 @@
}
}
+/* The page theme's edges, resolved once at the root. A `.light` file tile on
+ a dark page redefines --border; these keep its frame in the page color. */
+:root {
+ --page-border: var(--border);
+ --page-input: var(--input);
+}
+
/* Dark mode lights a dark panel from behind so it lifts off the dark page.
`backlight` glows a box; `backlight-image` follows a picture's own shape. */
@utility backlight {
diff --git a/site/src/cut/components/LibraryCard.tsx b/site/src/cut/components/LibraryCard.tsx
index 018ca470..7d8416c0 100644
--- a/site/src/cut/components/LibraryCard.tsx
+++ b/site/src/cut/components/LibraryCard.tsx
@@ -60,8 +60,8 @@ export function libraryTileBox(
return {
className: cn(
// `light`: a file looks the same in both themes; only the chrome around
- // it goes dark.
- "light relative max-w-full overflow-hidden rounded-xl border shadow-sm",
+ // it goes dark. The frame is the page's border, clear of the tile's fill.
+ "light relative max-w-full overflow-hidden rounded-xl border bg-clip-padding shadow-sm",
type === "lut" ? "bg-background" : "bg-muted",
!area && (font ? "aspect-[16/7]" : "aspect-square"),
// The sheet is the card, so nothing is drawn around it; the type
@@ -306,7 +306,7 @@ export function LibraryCard({
? PICKED_RING
: font
? "border-transparent"
- : "border-border",
+ : "border-page-border",
)}
style={box.style}
>
diff --git a/site/src/cut/components/LibraryImportCard.tsx b/site/src/cut/components/LibraryImportCard.tsx
index bf20e46e..6bb7b1db 100644
--- a/site/src/cut/components/LibraryImportCard.tsx
+++ b/site/src/cut/components/LibraryImportCard.tsx
@@ -122,7 +122,7 @@ export function LibraryImportCard({
"group",
box.className,
canPreview && "cursor-pointer",
- item.error ? "border-destructive/50 bg-muted" : font ? "border-transparent" : "border-border",
+ item.error ? "border-destructive/50 bg-muted" : font ? "border-transparent" : "border-page-border",
)}
style={item.error ? { ...box.style, backgroundColor: undefined, color: undefined } : box.style}
>
diff --git a/site/src/cut/components/SidePanel.tsx b/site/src/cut/components/SidePanel.tsx
index d2e022df..7c1bad8a 100644
--- a/site/src/cut/components/SidePanel.tsx
+++ b/site/src/cut/components/SidePanel.tsx
@@ -1514,7 +1514,7 @@ function AssetCard({
data-drag-object
className={cn(
// A file looks the same in both themes, like the Library's.
- "light relative aspect-square overflow-hidden rounded-xl border border-border bg-muted shadow-sm transition-colors group-hover:border-input",
+ "light relative aspect-square overflow-hidden rounded-xl border border-page-border bg-muted bg-clip-padding shadow-sm transition-colors group-hover:border-page-input",
(flash || selected) && PICKED_RING
)}
>
diff --git a/site/src/cut/components/TemplateCard.tsx b/site/src/cut/components/TemplateCard.tsx
index 07b12fbd..48064003 100644
--- a/site/src/cut/components/TemplateCard.tsx
+++ b/site/src/cut/components/TemplateCard.tsx
@@ -199,10 +199,10 @@ export function TemplateCard({
style={typeof tile === "number" ? { width: tile, height: tile } : undefined}
className={cn(
// A template is a file: it looks the same in both themes.
- "light group flex flex-col border bg-background text-foreground",
+ "light group flex flex-col border bg-background bg-clip-padding text-foreground",
tile ? "relative overflow-hidden rounded-xl p-2.5 shadow-sm" : "rounded-lg px-2.5 py-1.5",
tile === "fill" && "aspect-square w-full",
- selected ? PICKED_RING : "border-border",
+ selected ? PICKED_RING : "border-page-border",
drag ? "cursor-grab active:cursor-grabbing" : "cursor-pointer",
onRefDrop && refDrop.active && "border-primary bg-primary/10",
)}
diff --git a/site/src/cut/components/editor-mock/MockSidePanel.tsx b/site/src/cut/components/editor-mock/MockSidePanel.tsx
index ded540c7..6754d85a 100644
--- a/site/src/cut/components/editor-mock/MockSidePanel.tsx
+++ b/site/src/cut/components/editor-mock/MockSidePanel.tsx
@@ -138,7 +138,7 @@ function MediaPanel({ panel }: { panel: Extract<MockPanel, { tab: "media" }> })
function TemplateRow({ template }: { template: MockTemplate }) {
return (
- <div className="light flex items-center gap-2 rounded-lg border border-border bg-background px-2.5 py-1.5 text-foreground">
+ <div className="light flex items-center gap-2 rounded-lg border border-page-border bg-background bg-clip-padding px-2.5 py-1.5 text-foreground">
<Layers className="size-3.5 shrink-0 text-violet-500" />
<div className="min-w-0 flex-1">
<div className="truncate text-[12px] font-medium">{template.name}</div>
@@ -154,7 +154,7 @@ function TemplateRow({ template }: { template: MockTemplate }) {
function MediaCard({ item }: { item: MockMediaItem }) {
return (
<div className="flex flex-col gap-1.5 text-left">
- <div className="light relative aspect-square overflow-hidden rounded-lg border border-border bg-muted">
+ <div className="light relative aspect-square overflow-hidden rounded-lg border border-page-border bg-muted bg-clip-padding">
{item.kind === "audio" ? (
<AudioFace item={item} />
) : (