From a05593f3c2efc83c943644530b0dedf476198896 Mon Sep 17 00:00:00 2001 From: Matt McClure Date: Thu, 20 Aug 2026 00:50:04 +0000 Subject: [PATCH] fix(skin): migrate publisher skin to the stabilized css token vocabulary The css cleanup in #2094 renamed the default skin's internal tokens from --media-* to unprefixed names (--surface-*, --popup-transition-*, --default-accent-color, --focus-ring-color, ...), reserving --media-* for user-facing overrides read through var() fallbacks. The publisher skin still defined the old names, so menu/button hover highlights, the glass surface fill, popup transitions, and the focus ring all resolved to nothing. Also repoints two dangling references (--media-current-shadow-color, --media-color-primary) and stops defining the public --media-capture-placeholder-background knob on the container, which was blocking host-level overrides. --- .../src/default/css/components/capture.css | 6 +- .../src/default/css/components/publish.css | 30 ++++---- packages/skins/src/default/css/publisher.css | 72 +++++++++---------- .../default/tailwind/components/capture.ts | 8 +-- .../default/tailwind/components/publish.ts | 24 +++---- .../default/tailwind/publisher.tailwind.ts | 68 +++++++++--------- 6 files changed, 104 insertions(+), 104 deletions(-) diff --git a/packages/skins/src/default/css/components/capture.css b/packages/skins/src/default/css/components/capture.css index 4d2383d35a..19ab5f9daa 100644 --- a/packages/skins/src/default/css/components/capture.css +++ b/packages/skins/src/default/css/components/capture.css @@ -54,7 +54,7 @@ } .media-default-skin .media-capture-placeholder[data-capture-state="denied"] .media-capture-placeholder__message { - color: var(--media-publish-live-color); + color: var(--publish-live-color); opacity: 1; } @@ -114,7 +114,7 @@ width: calc(var(--spacing) * 3.5); height: calc(var(--spacing) * 3.5); opacity: 0.65; - filter: drop-shadow(0 1px 0 var(--media-current-shadow-color)); + filter: drop-shadow(0 1px 0 var(--shadow-current-color)); /* The chevron asset points right; aim it at the menu, which opens above. */ rotate: -90deg; transition: @@ -198,5 +198,5 @@ /* Muted affordance — tint the visible (slashed) icon. */ .media-button--camera[data-muted] .media-icon, .media-button--mic[data-muted] .media-icon { - color: var(--media-publish-live-color); + color: var(--publish-live-color); } diff --git a/packages/skins/src/default/css/components/publish.css b/packages/skins/src/default/css/components/publish.css index f70cccd050..335fb02c92 100644 --- a/packages/skins/src/default/css/components/publish.css +++ b/packages/skins/src/default/css/components/publish.css @@ -24,7 +24,7 @@ &[data-publish-state="live"] { color: oklch(1 0 0); - background: var(--media-publish-live-color); + background: var(--publish-live-color); } /* Transitional states: subdued and non-interactive cursor. */ @@ -40,8 +40,8 @@ /* Error: translucent red so it reads as attention without mimicking live. */ &[data-publish-state="error"] { - color: var(--media-publish-live-color); - background: oklch(from var(--media-publish-live-color) l c h / 0.15); + color: var(--publish-live-color); + background: oklch(from var(--publish-live-color) l c h / 0.15); } } @@ -65,15 +65,15 @@ gap: calc(var(--spacing) * 2); align-items: center; padding: calc(var(--spacing) * 1.5) calc(var(--spacing) * 3); - color: var(--media-color-primary, oklch(1 0 0)); + color: oklch(1 0 0); pointer-events: none; - background-color: var(--media-publish-status-background); + background-color: var(--publish-status-background); border-radius: calc(Infinity * 1px); box-shadow: - 0 0 0 1px var(--media-surface-outer-border-color), - 0 1px 3px 0 var(--media-surface-shadow-color), - inset 0 1px 0 0 var(--media-surface-inner-border-color); - backdrop-filter: var(--media-surface-backdrop-filter); + 0 0 0 1px var(--surface-outer-border-color), + 0 1px 3px 0 var(--surface-shadow-color), + inset 0 1px 0 0 var(--surface-inner-border-color); + backdrop-filter: var(--surface-backdrop-filter); @container media-root (width > 42rem) { --inset-factor: 3; @@ -113,7 +113,7 @@ &[data-publish-state="live"] { color: oklch(1 0 0); - background-color: var(--media-publish-live-color); + background-color: var(--publish-live-color); &::before { background-color: oklch(1 0 0); @@ -121,8 +121,8 @@ } &[data-publish-state="error"] { - color: var(--media-publish-live-color); - background-color: oklch(from var(--media-publish-live-color) l c h / 0.15); + color: var(--publish-live-color); + background-color: oklch(from var(--publish-live-color) l c h / 0.15); } @media (prefers-reduced-motion: no-preference) { @@ -157,12 +157,12 @@ opacity: 0.5; } &[data-quality="good"] { - color: var(--media-quality-good-color); + color: var(--quality-good-color); } &[data-quality="fair"] { - color: var(--media-quality-fair-color); + color: var(--quality-fair-color); } &[data-quality="poor"] { - color: var(--media-quality-poor-color); + color: var(--quality-poor-color); } } diff --git a/packages/skins/src/default/css/publisher.css b/packages/skins/src/default/css/publisher.css index 5b7b6922a9..36231a8bc6 100644 --- a/packages/skins/src/default/css/publisher.css +++ b/packages/skins/src/default/css/publisher.css @@ -88,57 +88,55 @@ ========================================================================== */ .media-default-skin--publisher { - --media-border-color: oklch(0 0 0 / 0.1); - --media-surface-background-color: oklch(1 0 0 / 0.1); - --media-surface-inner-border-color: oklch(1 0 0 / 0.1); - --media-surface-outer-border-color: oklch(0 0 0 / 0.1); - --media-surface-shadow-color: oklch(0 0 0 / 0.15); - --media-surface-backdrop-filter: blur(16px) saturate(1.5); + --default-accent-color: oklch(1 0 0); + --border-color: light-dark(oklch(0 0 0 / 0.1), oklch(1 0 0 / 0.15)); + --focus-ring-color: light-dark(oklch(0 0 0), oklch(1 0 0)); /* We have to create an alias so that the shadow DOM can inherit the custom property value */ - --media-video-border-radius: var(--media-border-radius, 1.75rem); + --media-video-border-radius: var(--container-border-radius); - --media-controls-transition-duration: 100ms; - --media-controls-transition-timing-function: ease-out; + --surface-background-color: oklch(1 0 0 / 0.1); + --surface-inner-border-color: oklch(1 0 0 / 0.1); + --surface-outer-border-color: oklch(0 0 0 / 0.1); + --surface-shadow-color: oklch(0 0 0 / 0.15); + --surface-backdrop-filter: blur(16px) saturate(1.5); - --media-error-dialog-transition-duration: 350ms; - --media-error-dialog-transition-delay: 100ms; - --media-error-dialog-transition-timing-function: ease-out; + --controls-transition-duration: 100ms; + --controls-transition-timing-function: ease-out; - --media-popup-transition-duration: 100ms; - --media-popup-transition-timing-function: ease-out; + --error-dialog-transition-duration: 350ms; + --error-dialog-transition-delay: 100ms; + --error-dialog-transition-timing-function: ease-out; + + --popup-transition-duration: 100ms; + --popup-transition-timing-function: ease-out; /* Publisher tokens. The live color matches the live-edge dot in button.css (no shared red token exists yet); quality colors are literals chosen to hold up on dark video — visual QA welcome. */ - --media-publish-live-color: oklch(0.65 0.22 27); - --media-quality-good-color: oklch(0.72 0.19 149); - --media-quality-fair-color: oklch(0.8 0.16 85); - --media-quality-poor-color: var(--media-publish-live-color); - --media-capture-placeholder-background: oklch(0.2 0 0); + --publish-live-color: oklch(0.65 0.22 27); + --quality-good-color: oklch(0.72 0.19 149); + --quality-fair-color: oklch(0.8 0.16 85); + --quality-poor-color: var(--publish-live-color); /* Ground for the top-left status capsule. Deliberately dark rather than the glass surface fill: it overlays live camera frames, and a translucent ground inherits whatever brightness is behind it. */ - --media-publish-status-background: oklch(0 0 0 / 0.6); + --publish-status-background: oklch(0 0 0 / 0.6); overflow: clip; background: oklch(0 0 0); @media (prefers-reduced-motion: reduce) { - --media-error-dialog-transition-duration: 50ms; - --media-error-dialog-transition-delay: 0ms; - --media-popup-transition-duration: 0ms; - } - - @media (prefers-color-scheme: dark) { - --media-border-color: oklch(1 0 0 / 0.15); + --error-dialog-transition-duration: 50ms; + --error-dialog-transition-delay: 0ms; + --popup-transition-duration: 0ms; } @media (prefers-reduced-transparency: reduce) or (prefers-contrast: more) { - --media-surface-background-color: oklch(0 0 0); - --media-surface-inner-border-color: oklch(1 0 0 / 0.25); - --media-surface-outer-border-color: transparent; - --media-publish-status-background: oklch(0 0 0); + --surface-background-color: oklch(0 0 0); + --surface-inner-border-color: oklch(1 0 0 / 0.25); + --surface-outer-border-color: transparent; + --publish-status-background: oklch(0 0 0); } /* Inner border ring */ @@ -149,11 +147,11 @@ pointer-events: none; content: ""; border-radius: inherit; - box-shadow: inset 0 0 0 1px var(--media-border-color); + box-shadow: inset 0 0 0 1px var(--border-color); } &:fullscreen { - --media-border-radius: 0; + --container-border-radius: 0; &::after { display: none; @@ -194,9 +192,9 @@ color: oklch(1 0 0); text-shadow: 0 1px 0 oklch(0 0 0 / 0.25); border-radius: calc(var(--spacing) * 7); - transition-delay: var(--media-error-dialog-transition-delay); - transition-timing-function: var(--media-error-dialog-transition-timing-function); - transition-duration: var(--media-error-dialog-transition-duration); + transition-delay: var(--error-dialog-transition-delay); + transition-timing-function: var(--error-dialog-transition-timing-function); + transition-duration: var(--error-dialog-transition-duration); transition-property: opacity, scale; } @@ -240,7 +238,7 @@ inset-inline: var(--inset); bottom: var(--inset); z-index: 10; - color: var(--media-color-primary, oklch(1 0 0)); + color: oklch(1 0 0); @container media-root (width > 42rem) { --inset-factor: 3; diff --git a/packages/skins/src/default/tailwind/components/capture.ts b/packages/skins/src/default/tailwind/components/capture.ts index 88fba1e00a..fb21bfdbd4 100644 --- a/packages/skins/src/default/tailwind/components/capture.ts +++ b/packages/skins/src/default/tailwind/components/capture.ts @@ -21,7 +21,7 @@ export const capturePlaceholder = { // While idle/ended the message would repeat the enable-devices CTA text — // let the CTA carry it and only show acquiring/denied guidance here. 'data-[capture-state=idle]:hidden data-[capture-state=ended]:hidden', - 'group-data-[capture-state=denied]/capture:text-(--media-publish-live-color)', + 'group-data-[capture-state=denied]/capture:text-(--publish-live-color)', 'group-data-[capture-state=denied]/capture:opacity-100' ), }; @@ -80,7 +80,7 @@ export const deviceControl = { ), /** Chevron inside the caret — the asset points right, so aim it at the menu above. */ caretIcon: cn( - 'size-3.5 -rotate-90 opacity-65 drop-shadow-[0_1px_0_var(--media-current-shadow-color)]', + 'size-3.5 -rotate-90 opacity-65 drop-shadow-[0_1px_0_var(--shadow-current-color)]', 'transition-[rotate,opacity] duration-150 ease-out motion-reduce:duration-0', 'group-hover/caret:opacity-100 group-focus-visible/caret:opacity-100 group-aria-expanded/caret:opacity-100', // Point back at the toggle while the picker is open. @@ -98,7 +98,7 @@ export const captureIconState = { on: 'hidden opacity-0 group-not-data-muted:block group-not-data-muted:opacity-100', off: cn( 'hidden opacity-0 group-data-muted:block group-data-muted:opacity-100', - 'group-data-muted:text-(--media-publish-live-color)' + 'group-data-muted:text-(--publish-live-color)' ), }, mic: { @@ -106,7 +106,7 @@ export const captureIconState = { on: 'hidden opacity-0 group-not-data-muted:block group-not-data-muted:opacity-100', off: cn( 'hidden opacity-0 group-data-muted:block group-data-muted:opacity-100', - 'group-data-muted:text-(--media-publish-live-color)' + 'group-data-muted:text-(--publish-live-color)' ), }, }; diff --git a/packages/skins/src/default/tailwind/components/publish.ts b/packages/skins/src/default/tailwind/components/publish.ts index 473d4050be..bbde11ff91 100644 --- a/packages/skins/src/default/tailwind/components/publish.ts +++ b/packages/skins/src/default/tailwind/components/publish.ts @@ -17,15 +17,15 @@ export const publishButton = cn( // Reserve room so the label swap (Go live ↔ Stop) doesn't resize the bar. 'min-w-20 bg-white font-medium text-black text-shadow-none', 'transition-[background-color,color,opacity,outline-offset,scale]', - 'data-[publish-state=live]:bg-(--media-publish-live-color) data-[publish-state=live]:text-white', + 'data-[publish-state=live]:bg-(--publish-live-color) data-[publish-state=live]:text-white', // Transitional states: subdued and non-interactive cursor. 'data-[publish-state=connecting]:cursor-progress data-[publish-state=connecting]:opacity-70', 'data-[publish-state=connecting]:active:scale-100', 'data-[publish-state=stopping]:cursor-progress data-[publish-state=stopping]:opacity-70', 'data-[publish-state=stopping]:active:scale-100', // Error: translucent red so it reads as attention without mimicking live. - 'data-[publish-state=error]:bg-[oklch(from_var(--media-publish-live-color)_l_c_h/0.15)]', - 'data-[publish-state=error]:text-(--media-publish-live-color)' + 'data-[publish-state=error]:bg-[oklch(from_var(--publish-live-color)_l_c_h/0.15)]', + 'data-[publish-state=error]:text-(--publish-live-color)' ); /** @@ -42,9 +42,9 @@ export const publishStatus = cn( 'pointer-events-none absolute top-2 left-2 z-10 flex items-center gap-2', '@2xl/media-root:top-3 @2xl/media-root:left-3', 'rounded-full px-3 py-1.5', - 'bg-(--media-publish-status-background) [backdrop-filter:var(--media-surface-backdrop-filter)]', - 'shadow-[0_0_0_1px_var(--media-surface-outer-border-color),0_1px_3px_0_var(--media-surface-shadow-color),inset_0_1px_0_0_var(--media-surface-inner-border-color)]', - '[color:var(--media-color-primary,oklch(1_0_0))]' + 'bg-(--publish-status-background) [backdrop-filter:var(--surface-backdrop-filter)]', + 'shadow-[0_0_0_1px_var(--surface-outer-border-color),0_1px_3px_0_var(--surface-shadow-color),inset_0_1px_0_0_var(--surface-inner-border-color)]', + 'text-white' ); /** @@ -62,10 +62,10 @@ export const publishBadge = cn( 'before:bg-current/40 before:transition-colors before:duration-150 before:ease-out', 'data-[publish-state=live]:px-2! data-[publish-state=live]:py-1!', 'data-[publish-state=error]:px-2! data-[publish-state=error]:py-1!', - 'data-[publish-state=live]:bg-(--media-publish-live-color) data-[publish-state=live]:text-white', + 'data-[publish-state=live]:bg-(--publish-live-color) data-[publish-state=live]:text-white', 'data-[publish-state=live]:before:bg-white', - 'data-[publish-state=error]:bg-[oklch(from_var(--media-publish-live-color)_l_c_h/0.15)]', - 'data-[publish-state=error]:text-(--media-publish-live-color)', + 'data-[publish-state=error]:bg-[oklch(from_var(--publish-live-color)_l_c_h/0.15)]', + 'data-[publish-state=error]:text-(--publish-live-color)', 'motion-safe:data-[publish-state=live]:before:animate-media-pulse', 'motion-safe:data-[publish-state=connecting]:before:animate-media-pulse' ); @@ -80,7 +80,7 @@ export const publishTimer = cn( export const connectionIndicator = cn( 'inline-flex items-center transition-[color,opacity] duration-150 ease-out', 'data-[quality=unknown]:opacity-50', - 'data-[quality=good]:text-(--media-quality-good-color)', - 'data-[quality=fair]:text-(--media-quality-fair-color)', - 'data-[quality=poor]:text-(--media-quality-poor-color)' + 'data-[quality=good]:text-(--quality-good-color)', + 'data-[quality=fair]:text-(--quality-fair-color)', + 'data-[quality=poor]:text-(--quality-poor-color)' ); diff --git a/packages/skins/src/default/tailwind/publisher.tailwind.ts b/packages/skins/src/default/tailwind/publisher.tailwind.ts index 47fbfe0429..566b03b862 100644 --- a/packages/skins/src/default/tailwind/publisher.tailwind.ts +++ b/packages/skins/src/default/tailwind/publisher.tailwind.ts @@ -30,7 +30,7 @@ export const root = (isShadowDOM: boolean) => // Inner border ring 'after:absolute after:pointer-events-none after:rounded-[inherit] after:z-10', '[&:fullscreen]:after:hidden', - 'after:inset-0 after:ring-1 after:ring-inset after:ring-black/10 dark:after:ring-white/15', + 'after:inset-0 after:ring-1 after:ring-inset after:ring-(color:--border-color)', // Preview video element. The horizontal mirror matches self-view // expectations; unconditional in v1 (also flips screen-share previews) — // see components/capture.css for rationale. Only the local preview is @@ -41,48 +41,50 @@ export const root = (isShadowDOM: boolean) => '[&_video]:block [&_video]:w-full [&_video]:h-full [&_video]:rounded-[inherit] [&_video]:[object-fit:var(--media-object-fit,contain)] [&_video]:[object-position:var(--media-object-position,center)] [&_video]:[scale:-1_1]': !isShadowDOM, }, - '[--media-video-border-radius:var(--media-border-radius,1.75rem)]', - '[--media-controls-transition-duration:100ms]', - '[--media-controls-transition-timing-function:ease-out]', - '[--media-error-dialog-transition-duration:350ms]', - '[--media-error-dialog-transition-delay:100ms]', - '[--media-error-dialog-transition-timing-function:ease-out]', - '[--media-popup-transition-duration:100ms]', - '[--media-popup-transition-timing-function:ease-out]', - '[--media-surface-background-color:oklch(1_0_0/0.1)]', - '[--media-surface-inner-border-color:oklch(1_0_0/0.1)]', - '[--media-surface-outer-border-color:oklch(0_0_0/0.1)]', - '[--media-surface-shadow-color:oklch(0_0_0/0.15)]', - '[--media-surface-backdrop-filter:blur(16px)_saturate(1.5)]', + '[--default-accent-color:oklch(1_0_0)]', + '[--border-color:light-dark(oklch(0_0_0/0.1),oklch(1_0_0/0.15))]', + '[--focus-ring-color:light-dark(oklch(0_0_0),oklch(1_0_0))]', + '[--media-video-border-radius:var(--container-border-radius)]', + '[--controls-transition-duration:100ms]', + '[--controls-transition-timing-function:ease-out]', + '[--error-dialog-transition-duration:350ms]', + '[--error-dialog-transition-delay:100ms]', + '[--error-dialog-transition-timing-function:ease-out]', + '[--popup-transition-duration:100ms]', + '[--popup-transition-timing-function:ease-out]', + '[--surface-background-color:oklch(1_0_0/0.1)]', + '[--surface-inner-border-color:oklch(1_0_0/0.1)]', + '[--surface-outer-border-color:oklch(0_0_0/0.1)]', + '[--surface-shadow-color:oklch(0_0_0/0.15)]', + '[--surface-backdrop-filter:blur(16px)_saturate(1.5)]', // Publisher tokens. The live color matches the live-edge dot in // `button.live` (no shared red token exists yet); quality colors are // literals chosen to hold up on dark video — visual QA welcome. - '[--media-publish-live-color:oklch(0.65_0.22_27)]', - '[--media-quality-good-color:oklch(0.72_0.19_149)]', - '[--media-quality-fair-color:oklch(0.8_0.16_85)]', - '[--media-quality-poor-color:var(--media-publish-live-color)]', - '[--media-capture-placeholder-background:oklch(0.2_0_0)]', + '[--publish-live-color:oklch(0.65_0.22_27)]', + '[--quality-good-color:oklch(0.72_0.19_149)]', + '[--quality-fair-color:oklch(0.8_0.16_85)]', + '[--quality-poor-color:var(--publish-live-color)]', // Ground for the top-left status capsule. Deliberately dark rather than // the glass surface fill: it overlays live camera frames, and a // translucent ground inherits whatever brightness is behind it. - '[--media-publish-status-background:oklch(0_0_0/0.6)]', + '[--publish-status-background:oklch(0_0_0/0.6)]', // Fullscreen scale 'min-[1280px]:[&:fullscreen]:[--scale:1.25]', 'min-[1536px]:[&:fullscreen]:[--scale:1.5]', 'min-[1920px]:[&:fullscreen]:[--scale:1.75]', - 'motion-reduce:[--media-error-dialog-transition-duration:50ms]', - 'motion-reduce:[--media-error-dialog-transition-delay:0ms]', - 'motion-reduce:[--media-popup-transition-duration:0ms]', - '[@media(prefers-reduced-transparency:reduce)]:[--media-surface-background-color:oklch(0_0_0)]', - 'contrast-more:[--media-surface-background-color:oklch(0_0_0)]', - '[@media(prefers-reduced-transparency:reduce)]:[--media-surface-inner-border-color:oklch(1_0_0/0.25)]', - 'contrast-more:[--media-surface-inner-border-color:oklch(1_0_0/0.25)]', - '[@media(prefers-reduced-transparency:reduce)]:[--media-surface-outer-border-color:transparent]', - 'contrast-more:[--media-surface-outer-border-color:transparent]', - '[@media(prefers-reduced-transparency:reduce)]:[--media-publish-status-background:oklch(0_0_0)]', - 'contrast-more:[--media-publish-status-background:oklch(0_0_0)]', + 'motion-reduce:[--error-dialog-transition-duration:50ms]', + 'motion-reduce:[--error-dialog-transition-delay:0ms]', + 'motion-reduce:[--popup-transition-duration:0ms]', + '[@media(prefers-reduced-transparency:reduce)]:[--surface-background-color:oklch(0_0_0)]', + 'contrast-more:[--surface-background-color:oklch(0_0_0)]', + '[@media(prefers-reduced-transparency:reduce)]:[--surface-inner-border-color:oklch(1_0_0/0.25)]', + 'contrast-more:[--surface-inner-border-color:oklch(1_0_0/0.25)]', + '[@media(prefers-reduced-transparency:reduce)]:[--surface-outer-border-color:transparent]', + 'contrast-more:[--surface-outer-border-color:transparent]', + '[@media(prefers-reduced-transparency:reduce)]:[--publish-status-background:oklch(0_0_0)]', + 'contrast-more:[--publish-status-background:oklch(0_0_0)]', // Fullscreen - '[&:fullscreen]:[--media-border-radius:0]', + '[&:fullscreen]:[--container-border-radius:0]', { '[&:fullscreen_video]:object-contain': !isShadowDOM, '[&:fullscreen_::slotted(video)]:object-contain': isShadowDOM, @@ -99,7 +101,7 @@ export const controls = cn( baseControls, surface, 'group/controls', - '[color:var(--media-color-primary,oklch(1_0_0))] z-10', + 'text-white z-10', 'peer-data-open/error:hidden!', 'absolute bottom-2 inset-x-2', '@2xl/media-root:bottom-3 @2xl/media-root:inset-x-3',