diff --git a/package-lock.json b/package-lock.json index ecdb2de8c..aefa1deff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -116,6 +116,7 @@ "@electron-forge/plugin-auto-unpack-natives": "7.7.0", "@electron/rebuild": "3.7.1", "@eslint/js": "9.22.0", + "@fullcalendar/list": "6.1.15", "@fullcalendar/timegrid": "6.1.15", "@playwright/test": "1.51.0", "@popperjs/core": "2.11.8", @@ -2903,6 +2904,16 @@ "@fullcalendar/core": "~6.1.15" } }, + "node_modules/@fullcalendar/list": { + "version": "6.1.15", + "resolved": "https://registry.npmjs.org/@fullcalendar/list/-/list-6.1.15.tgz", + "integrity": "sha512-U1bce04tYDwkFnuVImJSy2XalYIIQr6YusOWRPM/5ivHcJh67Gm8CIMSWpi3KdRSNKFkqBxLPkfZGBMaOcJYug==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "@fullcalendar/core": "~6.1.15" + } + }, "node_modules/@fullcalendar/timegrid": { "version": "6.1.15", "resolved": "https://registry.npmjs.org/@fullcalendar/timegrid/-/timegrid-6.1.15.tgz", diff --git a/package.json b/package.json index 0b5aae27e..3fd512309 100644 --- a/package.json +++ b/package.json @@ -173,6 +173,7 @@ "@electron-forge/plugin-auto-unpack-natives": "7.7.0", "@electron/rebuild": "3.7.1", "@eslint/js": "9.22.0", + "@fullcalendar/list": "6.1.15", "@fullcalendar/timegrid": "6.1.15", "@playwright/test": "1.51.0", "@popperjs/core": "2.11.8", diff --git a/src/public/app/widgets/view_widgets/calendar_view.ts b/src/public/app/widgets/view_widgets/calendar_view.ts index a376e4659..e019caf11 100644 --- a/src/public/app/widgets/view_widgets/calendar_view.ts +++ b/src/public/app/widgets/view_widgets/calendar_view.ts @@ -30,12 +30,19 @@ const TPL = ` .calendar-container { height: 100%; + --fc-border-color: var(--main-border-color); + --fc-neutral-bg-color: var(--launcher-pane-background-color); + --fc-list-event-hover-bg-color: var(--left-pane-item-hover-background); } .calendar-container .fc-toolbar.fc-header-toolbar { margin-bottom: 0.5em; } + .calendar-container .fc-list-sticky .fc-list-day > * { + z-index: 50; + } + body.desktop:not(.zen) .calendar-container .fc-toolbar.fc-header-toolbar { padding-right: 5em; } @@ -103,6 +110,7 @@ export default class CalendarView extends ViewMode { const plugins: PluginDef[] = []; plugins.push((await import("@fullcalendar/daygrid")).default); plugins.push((await import("@fullcalendar/timegrid")).default); + plugins.push((await import("@fullcalendar/list")).default); if (isEditable || this.isCalendarRoot) { plugins.push((await import("@fullcalendar/interaction")).default); } @@ -162,7 +170,7 @@ export default class CalendarView extends ViewMode { }, headerToolbar: { start: "title", - end: "dayGridMonth,timeGridWeek today prev,next" + end: "dayGridMonth,timeGridWeek,listMonth today prev,next" } }); calendar.render();