fix: rebase issues

This commit is contained in:
imperosol
2025-06-30 16:13:16 +02:00
parent ed51f75601
commit 5d78529702
3 changed files with 7 additions and 36 deletions

View File

@@ -45,35 +45,6 @@ body {
} }
} }
@mixin tooltip {
@include shadow;
z-index: 1;
pointer-events: none;
background-color: #333;
color: #fff;
border: 0.5px solid hsl(0, 0%, 50%);
border-radius: 5px;
padding: 5px 10px;
position: absolute;
white-space: nowrap;
opacity: 0;
transition: opacity 500ms ease-in;
}
.tooltip {
@include tooltip;
position: absolute;
width: max-content;
left: 0;
top: 0;
}
.tooltip[tooltip-status=open] {
opacity: 1;
transition: opacity 500ms ease-in;
}
.ib { .ib {
display: inline-block; display: inline-block;
padding: 1px; padding: 1px;

View File

@@ -52,9 +52,8 @@
"@fullcalendar/icalendar": "^6.1.20", "@fullcalendar/icalendar": "^6.1.20",
"@fullcalendar/interaction": "^6.1.19", "@fullcalendar/interaction": "^6.1.19",
"@fullcalendar/list": "^6.1.20", "@fullcalendar/list": "^6.1.20",
"@fullcalendar/resource": "^6.1.17", "@fullcalendar/resource": "^6.1.19",
"@fullcalendar/resource-timeline": "^6.1.17", "@fullcalendar/resource-timeline": "^6.1.19",
"@hey-api/client-fetch": "^0.8.2",
"@sentry/browser": "^10.38.0", "@sentry/browser": "^10.38.0",
"@zip.js/zip.js": "^2.8.20", "@zip.js/zip.js": "^2.8.20",
"3d-force-graph": "^1.79.1", "3d-force-graph": "^1.79.1",

View File

@@ -1,4 +1,3 @@
import { inheritHtmlElement, registerComponent } from "#core:utils/web-components";
import { import {
Calendar, Calendar,
type DateSelectArg, type DateSelectArg,
@@ -7,16 +6,18 @@ import {
} from "@fullcalendar/core"; } from "@fullcalendar/core";
import enLocale from "@fullcalendar/core/locales/en-gb"; import enLocale from "@fullcalendar/core/locales/en-gb";
import frLocale from "@fullcalendar/core/locales/fr"; import frLocale from "@fullcalendar/core/locales/fr";
import interactionPlugin, { type EventResizeDoneArg } from "@fullcalendar/interaction";
import resourceTimelinePlugin from "@fullcalendar/resource-timeline";
import { paginated } from "#core:utils/api";
import { inheritHtmlElement, registerComponent } from "#core:utils/web-components";
import { import {
type ReservationslotFetchSlotsData, type ReservationslotFetchSlotsData,
type SlotSchema,
reservableroomFetchRooms, reservableroomFetchRooms,
reservationslotFetchSlots, reservationslotFetchSlots,
reservationslotUpdateSlot, reservationslotUpdateSlot,
type SlotSchema,
} from "#openapi"; } from "#openapi";
import { paginated } from "#core:utils/api";
import type { SlotSelectedEventArg } from "#reservation:reservation/types"; import type { SlotSelectedEventArg } from "#reservation:reservation/types";
import interactionPlugin from "@fullcalendar/interaction"; import interactionPlugin from "@fullcalendar/interaction";
import resourceTimelinePlugin from "@fullcalendar/resource-timeline"; import resourceTimelinePlugin from "@fullcalendar/resource-timeline";