+
{formatDateLong(vacation.startDate)} to {formatDateLong(vacation.endDate)}
{holidayMeta ? (
-
{holidayMeta}
+
{holidayMeta}
) : null}
{holidayLocationBasis ? (
-
{holidayLocationBasis}
+
{holidayLocationBasis}
) : null}
{isPublicHoliday && vacation.calendarName ? (
-
+
Calendar: {vacation.calendarName}
) : null}
{vacation.note && !isPublicHoliday ? (
-
{vacation.note}
+
{vacation.note}
) : null}
);
@@ -376,7 +376,7 @@ export function TimelineTooltip({
,
);
@@ -410,8 +410,8 @@ export function TimelineTooltip({
,
diff --git a/apps/web/src/components/timeline/renderHelpers.tsx b/apps/web/src/components/timeline/renderHelpers.tsx
index 03b44b1..b14aa0a 100644
--- a/apps/web/src/components/timeline/renderHelpers.tsx
+++ b/apps/web/src/components/timeline/renderHelpers.tsx
@@ -64,8 +64,8 @@ export function renderVacationBlocks(blocks: VacationBlockInfo[], rowHeight: num
if (blocks.length === 0) return null;
return blocks.map(({ vacation: v, left, width }) => {
- const colorClass = VACATION_TIMELINE_COLORS[v.type] ?? "bg-orange-400/40";
- const borderClass = VACATION_TIMELINE_BORDER[v.type] ?? "border-orange-500";
+ const colorClass = VACATION_TIMELINE_COLORS[v.type] ?? "bg-brand-400/40";
+ const borderClass = VACATION_TIMELINE_BORDER[v.type] ?? "border-brand-500";
const label = VACATION_TYPE_LABELS_SHORT[v.type] ?? v.type;
const isPending = v.status === "PENDING";
diff --git a/apps/web/src/hooks/useTimelineLayout.tsx b/apps/web/src/hooks/useTimelineLayout.tsx
index 7ad3d41..48a3a44 100644
--- a/apps/web/src/hooks/useTimelineLayout.tsx
+++ b/apps/web/src/hooks/useTimelineLayout.tsx
@@ -37,16 +37,15 @@ export function useTimelineLayout(
// Grid lines — memoized; identical for every row
const gridLines = useMemo(() => dates.map((date, i) => {
const isToday = date.toDateString() === today.toDateString();
- const isSaturday = date.getDay() === 6;
- const isSunday = date.getDay() === 0;
+ const dow = date.getDay();
+ const isWeekend = dow === 0 || dow === 6;
return (
= {
/** Vacation overlay colors for timeline bars */
export const VACATION_TIMELINE_COLORS: Record = {
- ANNUAL: "bg-orange-400/40",
+ ANNUAL: "bg-brand-400/40",
SICK: "bg-red-500/40",
- PUBLIC_HOLIDAY: "bg-violet-400/40",
- OTHER: "bg-amber-400/40",
+ PUBLIC_HOLIDAY: "bg-brand-300/35",
+ OTHER: "bg-brand-400/30",
};
export const VACATION_TIMELINE_BORDER: Record = {
- ANNUAL: "border-orange-500",
+ ANNUAL: "border-brand-500",
SICK: "border-red-600",
- PUBLIC_HOLIDAY: "border-violet-500",
- OTHER: "border-amber-500",
+ PUBLIC_HOLIDAY: "border-brand-400",
+ OTHER: "border-brand-500",
};
export const VACATION_TYPE_LABELS_SHORT: Record = {