diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css index 8d349e8c2..d2df19c0e 100644 --- a/public/css/components/calendar.css +++ b/public/css/components/calendar.css @@ -42,6 +42,9 @@ --fhc-calendar-bg-allday: var(--fhc-calendar-bg); --fhc-calendar-bg-body: var(--fhc-calendar-bg); + --fhc-calendar-bg-month-today: var(--fhc-primary); + --fhc-calendar-color-month-today: var(--fhc-white-10); + --fhc-calendar-bg-overlay1: var(--fhc-calendar-bg); --fhc-calendar-bg-overlay2: var(--fhc-dark, #212529); diff --git a/public/css/components/calendar/frame.css b/public/css/components/calendar/frame.css index dcad26abf..ab400c95d 100644 --- a/public/css/components/calendar/frame.css +++ b/public/css/components/calendar/frame.css @@ -44,15 +44,21 @@ content: "/"; } .fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-header { - --event-bg: transparent; - font-weight: bold; - text-indent: 0; - font-size: var(--fhc-calendar-fontsize-month-day, 1rem); + height: 100%; +} +.fhc-calendar-mode-month .fhc-calendar-base-label-day { + width: 100%; height: 100%; display: flex; justify-content: center; align-items: center; } +.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-header { + --event-bg: transparent; + font-weight: bold; + text-indent: 0; + font-size: var(--fhc-calendar-fontsize-month-day, 1rem); +} .fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-header .disabled { opacity: .3; } @@ -114,6 +120,15 @@ width: 100%; border-left: solid 1px var(--fhc-calendar-gap); } +.fhc-calendar-mode-day .today { + background-color: var(--fhc-calendar-bg-day-today); + color: var(--fhc-calendar-color-day-today); +} +/* Week */ +.fhc-calendar-mode-week .today { + background-color: var(--fhc-calendar-bg-week-today); + color: var(--fhc-calendar-color-week-today); +} /* Month */ .fhc-calendar-mode-month .fhc-calendar-base-grid-line { overflow: hidden; @@ -137,6 +152,15 @@ overflow: hidden; text-overflow: ellipsis; } +.fhc-calendar-mode-month .event > .today { + background-color: var(--fhc-calendar-bg-month-today); + color: var(--fhc-calendar-color-month-today); +} +/* List */ +.fhc-calendar-mode-list .today { + background-color: var(--fhc-calendar-bg-list-today); + color: var(--fhc-calendar-color-list-today); +} /* Overlays */ /* ======== */ diff --git a/public/js/components/Calendar/Mode/Day/View.js b/public/js/components/Calendar/Mode/Day/View.js index 56065bbfd..09738f1d0 100644 --- a/public/js/components/Calendar/Mode/Day/View.js +++ b/public/js/components/Calendar/Mode/Day/View.js @@ -13,7 +13,8 @@ export default { }, inject: { timeGrid: "timeGrid", - originalEvents: "events" + originalEvents: "events", + timezone: "timezone" }, props: { day: { @@ -71,6 +72,9 @@ export default { return null; // null => loading return first; + }, + isToday() { + return this.day.hasSame(luxon.DateTime.now().setZone(this.timezone), 'day'); } }, watch: { @@ -116,13 +120,15 @@ export default { all-day-events >