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
fix(calendar): events styling and calendar color indicator (#5917)
dev-rbcd8417b606e1
diff --git a/apps/web/src/features/calendar/calendar.css b/apps/web/src/features/calendar/calendar.cssindex 13e25332ff..89a8c08834 100644--- a/apps/web/src/features/calendar/calendar.css+++ b/apps/web/src/features/calendar/calendar.css@@ -220,13 +220,9 @@}.calendar-view .fc .fc-event {- --fc-event-bg-color: color-mix(- in oklch,- var(--event-calendar-color, var(--color-calendar)) 5%,- var(--color-surface)- );+ --fc-event-bg-color: var(--color-panel);--fc-event-border-color: var(--event-calendar-color, var(--color-calendar));- --fc-event-text-color: var(--event-calendar-color, var(--color-calendar));+ --fc-event-text-color: var(--color-ink-muted);border-color: var(--fc-event-border-color);background-color: var(--fc-event-bg-color);color: var(--fc-event-text-color);@@ -332,6 +328,7 @@}.calendar-view .fc .fc-event .calendar-event-content {+ position: relative;container-type: inline-size;border-radius: inherit;transition: background-color 120ms ease-out;@@ -409,14 +406,68 @@display: none;}+.calendar-view .fc .calendar-event-color-bar {+ position: absolute;+ top: 2px;+ left: 2px;+ z-index: 1;+ width: 4px;+ height: min(2rem, 70%);+ border-radius: 9999px;+ background: var(--event-calendar-color, var(--color-calendar));+}++.calendar-view+ .fc+ .calendar-event-content-with-color-bar+ .calendar-event-content-layout {+ padding-left: 10px;+}++/* Single-day timed events use a compact dot treatment in the month grid. */+.calendar-view .fc .fc-dayGridMonth-view .fc-daygrid-dot-event {+ border: 0;+ background-color: transparent;+ color: var(--color-ink-muted);+}++.calendar-view+ .fc+ .fc-dayGridMonth-view+ .fc-daygrid-dot-event+ .calendar-event-title {+ min-width: 0;+ flex-shrink: 1;+}++.calendar-view .fc .calendar-event-response-dot {+ width: 0.5rem;+ height: 0.5rem;+ flex: none;+ border: 1px solid var(--event-calendar-color, var(--color-calendar));+ border-radius: 9999px;+ background: var(--event-calendar-color, var(--color-calendar));+}++.calendar-view+ .fc+ .calendar-event-content[data-response-status="tentative"]+ .calendar-event-response-dot {+ border-style: dashed;+ background: transparent;+}++.calendar-view+ .fc+ .calendar-event-content[data-response-status="needs_action"]+ .calendar-event-response-dot {+ background: transparent;+}+.calendar-view.fc.fc-event:has(.calendar-event-content[data-response-status="tentative"]) {- --fc-event-bg-color: color-mix(- in oklch,- var(--event-calendar-color, var(--color-calendar)) 2%,- var(--color-surface)- );+ --fc-event-bg-color: var(--color-panel);border-style: dashed;}@@ -437,11 +488,7 @@.fc.fc-event:has(.calendar-event-content[data-response-status="needs_action"]) {--fc-event-bg-color: transparent;- --fc-event-text-color: color-mix(- in oklch,- var(--event-calendar-color, var(--color-calendar)) 65%,- var(--color-ink-muted)- );+ --fc-event-text-color: var(--color-ink-muted);}.calendar-view .fc .fc-event:hover {@@ -450,12 +497,20 @@.calendar-view .fc .fc-event:focus-visible {z-index: 4;- box-shadow: 0 0 0 1px currentColor;+ outline: none;+ box-shadow: 0 0 0 1px var(--color-ink-muted);+}++.calendar-view .fc .fc-event:focus-visible::after {+ background: transparent;+}++.calendar-view .fc .fc-event:hover .calendar-event-content {+ background-color: var(--color-hover);}-.calendar-view .fc .fc-event:hover .calendar-event-content,.calendar-view .fc .fc-event:focus-visible .calendar-event-content {- background-color: color-mix(in oklch, var(--color-accent) 10%, transparent);+ background-color: var(--color-active);}.calendar-view .fc .fc-event:has(.calendar-event-content-selected) {@@ -474,6 +529,14 @@color: var(--color-surface);}+.calendar-view+ .fc+ .calendar-event-content.calendar-event-content-selected+ .calendar-event-response-dot {+ border-color: currentColor;+ background: currentColor;+}+.calendar-view .fc .fc-dayGridMonth-view .fc-daygrid-day-frame {min-height: 4rem;}diff --git a/apps/web/src/features/calendar/components/EventContent.tsx b/apps/web/src/features/calendar/components/EventContent.tsxindex 4de3e3a0de..ac9a8fee3f 100644--- a/apps/web/src/features/calendar/components/EventContent.tsx+++ b/apps/web/src/features/calendar/components/EventContent.tsx@@ -37,8 +37,10 @@ export function hasEveryoneElseDeclined(/** Renders responsive event content for FullCalendar. */export function EventContent(props: EventContentProps) {const isRenderedAllDay = () => props.renderProps.event.allDay;- const isCompact = () =>- isRenderedAllDay() || props.renderProps.view.type === 'dayGridMonth';+ const isMonthView = () => props.renderProps.view.type === 'dayGridMonth';+ const showsMonthDot = () => isMonthView() && !isRenderedAllDay();+ const showsColorBar = () => !isMonthView() || isRenderedAllDay();+ const isCompact = () => isRenderedAllDay() || isMonthView();const showLocation = () =>!isRenderedAllDay() && props.renderProps.view.type === 'timeGridDay';const selfResponseStatus = () =>@@ -75,10 +77,14 @@ export function EventContent(props: EventContentProps) {class={cn('calendar-event-content w-full min-w-0 overflow-hidden',!isCompact() && 'h-full min-h-0',+ showsColorBar() && 'calendar-event-content-with-color-bar',props.isSelected && 'calendar-event-content-selected')}data-response-status={selfResponseStatus()}>+ <Show when={showsColorBar()}>+ <span class="calendar-event-color-bar" aria-hidden="true" />+ </Show><divclass={cn('calendar-event-content-layout flex w-full min-h-0 flex-col overflow-hidden',@@ -88,6 +94,9 @@ export function EventContent(props: EventContentProps) {'calendar-event-content-layout-single-line')}>+ <Show when={showsMonthDot()}>+ <span class="calendar-event-response-dot" aria-hidden="true" />+ </Show><span class="calendar-event-title-row flex max-w-full min-w-0 shrink-0 items-center gap-0.5"><Show when={everyoneElseDeclined()}><span@@ -101,7 +110,7 @@ export function EventContent(props: EventContentProps) {</Show><spanclass={cn(- 'calendar-event-title min-w-0 max-w-full shrink font-semibold leading-tight',+ 'calendar-event-title min-w-0 max-w-full shrink font-medium leading-tight',props.isNarrow ? 'whitespace-nowrap' : 'truncate')}>diff --git a/apps/web/src/features/calendar/types.ts b/apps/web/src/features/calendar/types.tsindex 55ffa6beeb..124ace56a8 100644--- a/apps/web/src/features/calendar/types.ts+++ b/apps/web/src/features/calendar/types.ts@@ -146,7 +146,7 @@ export function mapCalendarEventToFullCalendar(start: allDayRange?.start ?? event.start,end: allDayRange?.end ?? event.end,allDay: isRenderedAllDay,- display: 'block',+ display: 'auto',startEditable: interactionEditable,durationEditable: interactionEditable,extendedProps: {