From ec48dbf2ed953fe105385e3a6ffeef22cde77b47 Mon Sep 17 00:00:00 2001 From: Void Date: Wed, 11 Nov 2026 17:23:13 +0000 Subject: [PATCH] Navigator: no label plate (Meta); icon weights and the solid unread dot stay Co-Authored-By: Claude Sonnet 5.5 --- src/app/components/nav/styles.css.ts | 17 +++++------------ .../features/room-nav/RoomNavCategoryButton.tsx | 3 +-- src/app/features/room-nav/styles.css.ts | 7 +++++++ 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/app/components/nav/styles.css.ts b/src/app/components/nav/styles.css.ts index 35cd729a..e6156362 100644 --- a/src/app/components/nav/styles.css.ts +++ b/src/app/components/nav/styles.css.ts @@ -2,6 +2,7 @@ import { ComplexStyleRule, StyleRule, createVar, globalStyle, style } from '@van import { RecipeVariants, recipe } from '@vanilla-extract/recipes'; import { ContainerColor, DefaultReset, Disabled, RadiiVariant, color, config, toRem } from 'folds'; import { surfaceInk } from '../../features/scene/sceneShell.css'; +import { skyLabelInk } from '../../features/scene/skyLabelInk'; // Wash strengths over the scene: rows and labels are faint, and hover, selected and pressed rows // are three distinct steps above them. @@ -31,7 +32,7 @@ export const NavLevel = style({ paddingLeft: LEVEL_STEP, }); -// Chevrons and room icons are matched in measured ink (a room glyph is about 1.7x a chevron's, unread rooms stay far above), so a foldout is not outweighed by its rooms. +// Chevrons and room icons are matched in measured ink (a room glyph is about 1.7x a chevron's; unread rooms stay far above), so a foldout is not outweighed by its rooms. export const NAV_ICON_REST_OPACITY = 0.9; // A room's glyph is bigger and denser than the chevron, so it rests lighter to read as the same weight. export const NAV_ROOM_ICON_REST_OPACITY = 0.26; @@ -251,17 +252,9 @@ phoneLabel(`.${NavItemBase}:has(.${NavLink}:active) ${label}`, { opacity: 0.6, textDecorationLine: 'underline', }); -// Over the scene a label sits on a feathered plate of the theme's own surface (not a card: no edge, the -// shadow carries it past the text) and wears the theme's own ink, the colour that surface was made for. -// The plate is on the label itself, so the label is at full strength here: an opacity would fade the plate too. -const LABEL_PLATE = `color-mix(in srgb, ${surfaceInk} 80%, transparent)`; -/** The same plate for text that is not a row label (a foldout's heading). */ -export const NavPlate = style({}); -globalStyle(`:root[data-scene] ${label}, :root[data-scene] .${NavPlate}`, { - opacity: 1, - backgroundColor: LABEL_PLATE, - boxShadow: `0 0 6px 5px ${LABEL_PLATE}`, - borderRadius: toRem(6), +phoneLabel(`:root[data-scene] ${label}`, { + color: skyLabelInk('inherit'), + textShadow: `0 0 3px ${surfaceInk}, 0 0 8px ${surfaceInk}`, }); // Icons, dots and the Join action share the label's halo over the scene. diff --git a/src/app/features/room-nav/RoomNavCategoryButton.tsx b/src/app/features/room-nav/RoomNavCategoryButton.tsx index 90e1f5d6..74945be3 100644 --- a/src/app/features/room-nav/RoomNavCategoryButton.tsx +++ b/src/app/features/room-nav/RoomNavCategoryButton.tsx @@ -2,7 +2,6 @@ import React from 'react'; import { as, Chip, Icon, Icons, Text } from 'folds'; import classNames from 'classnames'; import { NavGutter } from '../../components/nav'; -import { NavPlate } from '../../components/nav/styles.css'; import * as css from './styles.css'; export const RoomNavCategoryButton = as<'button', { closed?: boolean }>( @@ -22,7 +21,7 @@ export const RoomNavCategoryButton = as<'button', { closed?: boolean }>( src={closed ? Icons.ChevronRight : Icons.ChevronBottom} /> - + {children} diff --git a/src/app/features/room-nav/styles.css.ts b/src/app/features/room-nav/styles.css.ts index f87de142..1d46e596 100644 --- a/src/app/features/room-nav/styles.css.ts +++ b/src/app/features/room-nav/styles.css.ts @@ -1,5 +1,7 @@ import { style } from '@vanilla-extract/css'; import { config } from 'folds'; +import { surfaceInk } from '../scene/sceneShell.css'; +import { skyLabelInk } from '../scene/skyLabelInk'; import { NAV_ICON_REST_OPACITY } from '../../components/nav/styles.css'; export const CategoryButton = style({ @@ -19,6 +21,11 @@ export const CategoryButton = style({ border: 'none', borderRadius: 0, }, + ':root[data-scene] &&': { + color: skyLabelInk('inherit'), + textShadow: `0 0 3px ${surfaceInk}, 0 0 8px ${surfaceInk}`, + filter: `drop-shadow(0 0 3px ${surfaceInk})`, + }, }, }, },