diff --git a/client/src/mobile/components/MSheet.tsx b/client/src/mobile/components/MSheet.tsx index 071d27622..e1fa7644b 100644 --- a/client/src/mobile/components/MSheet.tsx +++ b/client/src/mobile/components/MSheet.tsx @@ -170,7 +170,8 @@ export default function MSheet({ const exitClass = EXIT[variant] const animation = open ? (entered ? '' : enterClass) : flung ? '' : exitClass - const resolvedMaterial = material ?? (variant === 'bottom' ? 'bar-glass' : 'glass') + // One material for every sheet, docked or floating, so they all read the same. + const resolvedMaterial = material ?? 'glass' return createPortal( // m-root on the overlay so the --m-* tokens resolve even when the portal diff --git a/client/src/mobile/screens/vacay/MVacay.tsx b/client/src/mobile/screens/vacay/MVacay.tsx index a75d130a5..63bc83427 100644 --- a/client/src/mobile/screens/vacay/MVacay.tsx +++ b/client/src/mobile/screens/vacay/MVacay.tsx @@ -1,5 +1,5 @@ import { useRef } from 'react' -import { Building2, Check, ChevronDown, ChevronLeft, ChevronRight, Eye, EyeOff, Minus, PenLine, Pencil, Plus, Settings2, Share2, ShieldCheck, Trash2, Unlink, UserPlus } from 'lucide-react' +import { Building2, Check, ChevronDown, ChevronLeft, ChevronRight, Eye, EyeOff, Minus, PenLine, Pencil, Plus, Settings2, Share2, ShieldCheck, Trash2, Unlink, UserPlus, Users, Palette } from 'lucide-react' import type { LucideIcon } from 'lucide-react' import MSheet from '../../components/MSheet' import MIconBtn from '../../components/MIconBtn' @@ -14,6 +14,7 @@ import MVacaySettingsSheet from './MVacaySettingsSheet' import MVacayShareSheet from './MVacayShareSheet' import { FALLBACK_PERSON_COLOR } from './vacayDayModel' import { fmtDays } from '../../../components/Vacay/vacayFormat' +import { TileHeader } from '../trip/sheets/MTripSheetUi' /** The company-holiday tint the calendar cells use (vacayDayModel). */ const COMPANY_COLOR = 'var(--m-vacay-company)' @@ -364,8 +365,15 @@ export default function MVacay() { v.setSheet(null)} /> v.setSheet(null)} /> v.setSheet(null)} variant="bottom" ariaLabel={t('mobileVacay.people')}> -
-
{t('mobileVacay.people')}
+
+
+ } + title={t('mobileVacay.people')} + onClose={() => v.setSheet(null)} + closeLabel={t('common.close')} + /> +
{v.users.map(u => { const color = u.color || FALLBACK_PERSON_COLOR @@ -411,8 +419,15 @@ export default function MVacay() {
v.setSheet(null)} variant="bottom" ariaLabel={t('mobileVacay.legend')}> -
-
{t('mobileVacay.legend')}
+
+
+ } + title={t('mobileVacay.legend')} + onClose={() => v.setSheet(null)} + closeLabel={t('common.close')} + /> +
{legendItems.map(item => (