Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
Revert calendar pill theme changes (#6564) (#6566)
Jacob Beckermanf1aca0fa22e8
diff --git a/apps/web/src/features/calendar/calendar.css b/apps/web/src/features/calendar/calendar.cssindex d20edbeebc..282b381f96 100644--- a/apps/web/src/features/calendar/calendar.css+++ b/apps/web/src/features/calendar/calendar.css@@ -443,9 +443,9 @@width: 0.5rem;height: 0.5rem;flex: none;- border: 1px solid var(--calendar-event-marker, var(--event-calendar-color, var(--color-calendar)));+ border: 1px solid var(--event-calendar-color, var(--color-calendar));border-radius: 9999px;- background: var(--calendar-event-marker, var(--event-calendar-color, var(--color-calendar)));+ background: var(--event-calendar-color, var(--color-calendar));}.calendar-view@@ -465,7 +465,7 @@/* Unanswered and tentative invitations stay filled, with a softer tint. */.calendar-view .fc .fc-event:not(.fc-event-mirror):not(:has(.calendar-event-content-selected)):has(.calendar-event-content:is([data-response-status="tentative"], [data-response-status="needs_action"])) {- --fc-event-bg-color: var(--calendar-event-unanswered-fill, color-mix(in oklch, var(--calendar-event-fill) 85%, white));+ --fc-event-bg-color: color-mix(in oklch, var(--calendar-event-fill) 85%, white);}.calendar-view@@ -542,81 +542,6 @@background: currentColor;}-/* Match the chat composer's surface and depth in both theme modes.- Other calendars keep only a trace of their source hue in the opaque fill. */-html[data-theme-light] .calendar-view {- --calendar-event-hover-brightness: 1.1;- --calendar-event-marker-lightness: 0.65;-- .fc .fc-event {- --calendar-event-fill: color-mix(in oklab, var(--color-composer) 92%, var(--event-calendar-color, var(--calendar-selection-color, var(--color-calendar))));- --calendar-event-ink: var(--color-composer-ink);- --calendar-event-marker: oklch(from var(--event-calendar-color, var(--color-calendar)) var(--calendar-event-marker-lightness) min(c, 0.045) h);- --calendar-event-unanswered-fill: color-mix(in oklab, var(--calendar-event-fill) 94%, var(--color-ink));- backdrop-filter: none;- --calendar-event-shadow: var(--glass-shadow);- box-shadow: var(--calendar-event-ring), var(--calendar-event-shadow);- }-- .fc .calendar-event-primary {- --calendar-event-fill: var(--color-composer);- --calendar-event-marker: var(--color-ink-muted);- }-- /* Keep month rows flat; all-day and out-of-office chips retain their depth. */- .fc .fc-daygrid-dot-event:not(.calendar-event-out-of-office) {- box-shadow: var(--calendar-event-ring);-- &::after {- content: none;- }- }-- .fc .fc-event:has(.calendar-event-content-selected) {- --fc-event-bg-color: var(--calendar-event-fill);- --fc-event-text-color: var(--calendar-event-ink);- --calendar-event-ring: 0 0 0 1px var(--color-accent);- }-- .fc .fc-event:has(.calendar-event-content-selected) .calendar-event-content-selected {- background-color: transparent;- color: var(--calendar-event-ink);- }-- /* Creation, drag, and resize previews stay in the same muted palette. */- .fc .fc-event-mirror,- .fc .calendar-multi-day-selection-preview-event {- background: var(--calendar-event-fill);- color: var(--calendar-event-ink);- box-shadow: 0 0 0 1px var(--color-ink-muted), var(--calendar-event-shadow);- }-- .fc .fc-event-mirror .calendar-event-content,- .fc .calendar-event-selection-preview {- color: var(--calendar-event-ink);- filter: none;- }-- @media (hover: hover) {- .fc .fc-event:hover:not(.fc-event-mirror):not(.calendar-multi-day-selection-preview-event):not(:has(.calendar-event-content-selected)) {- filter: brightness(var(--calendar-event-hover-brightness));- }- }-}--html[data-theme-light="true"] .calendar-view {- --calendar-event-hover-brightness: 0.97;- --calendar-event-marker-lightness: 0.5;-- .fc .fc-event {- /* The light composer uses a fine outline and soft ambient shadows. */- --calendar-event-shadow: 0 0 0 0.9375px var(--color-drop-shadow),- 0 1.875px 7.5px 0 var(--color-drop-shadow),- 0 3.75px 75px 7.5px color-mix(in srgb, var(--color-drop-shadow) 60%, transparent);- border-width: 0;- }-}-.calendar-view .fc .fc-dayGridMonth-view .fc-daygrid-day-frame {min-height: 4rem;}diff --git a/apps/web/src/features/calendar/components/CalendarGrid.tsx b/apps/web/src/features/calendar/components/CalendarGrid.tsxindex d460d5c7ac..db27ed82cf 100644--- a/apps/web/src/features/calendar/components/CalendarGrid.tsx+++ b/apps/web/src/features/calendar/components/CalendarGrid.tsx@@ -159,7 +159,6 @@ export function CalendarGrid(props: CalendarGridProps) {props.emphasizedEventIds?.has(id));const classNames = [- ...(event.calendar.isPrimary ? ['calendar-event-primary'] : []),...(emphasized ? ['calendar-event-emphasized'] : []),...(event.eventType === 'out_of_office'? ['calendar-event-out-of-office']@@ -293,7 +292,6 @@ export function CalendarGrid(props: CalendarGridProps) {}: undefined}- eventClassNames={() => ['dark-mode:glass-input']}eventDidMount={({ el, event, isMirror }) => {const eventId = calendarEventRenderId(event);const calendarEvent = eventByRenderId(eventId);diff --git a/docs/AGENT_GUIDE/surfaces.md b/docs/AGENT_GUIDE/surfaces.mdindex d2e63b38ee..a63c2a336c 100644--- a/docs/AGENT_GUIDE/surfaces.md+++ b/docs/AGENT_GUIDE/surfaces.md@@ -438,11 +438,6 @@ from an opened file.Calendars default to Day on phones and Week on desktop. The selected view isremembered locally on each device.-Primary-calendar event pills share the chat composer's surface: charcoal with a-glass rim/shadow in dark mode, pale with a fine outline and soft shadows in light-mode. Other calendars use subtle source-color tints of that surface; selection-adds an accent outline. Month-view timed events keep their compact dots.-Calendar event creation and editing open in a bottom sheet on touch devices,with scrollable content above the keyboard. Desktop retains the centered dialog.Dismissing a changed event still asks before discarding the draft.