Merge 2163334c4f6d88a94cdab18a4cc7558fcd90acdd into 8eca14069a263efac5133f0aa6e946e0ad9d554e

apps/client/src/widgets/collections/calendar/index.css

@@ -49,6 +49,30 @@
     z-index: 50;
 }
 
+.calendar-container a.fc-event {
+    text-decoration: none;
+}
+
+.calendar-container a.fc-event.archived {
+    opacity: .65;
+}
+
+.calendar-container a.fc-event.archived::after {
+    content: "";
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: -1;
+
+    --c1: transparent;
+    --c2: var(--callendar-coll-event-archived-sripe-color);
+
+    background: repeating-linear-gradient(45deg, var(--c1), var(--c1) 8px,
+                                          var(--c2) 8px, var(--c2) 16px) !important;
+}
+
 .calendar-container .fc-button {
     padding: 0.2em 0.5em;
 }
@@ -89,40 +113,17 @@ body.desktop:not(.zen) .calendar-view .calendar-header {
 
 /* #region Events */
 
-/*
- * week, month, year views
- */
-
- .calendar-container a.fc-event {
-    text-decoration: none;
-}
-
-.calendar-container a.fc-event.archived {
-    opacity: .65;
-}
-
-.calendar-container a.fc-event.archived::after {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-
-    --c1: transparent;
-    --c2: var(--callendar-coll-event-archived-sripe-color);
-
-    background: repeating-linear-gradient(45deg, var(--c1), var(--c1) 8px,
-                                          var(--c2) 8px, var(--c2) 16px);
-}
-
 .calendar-view a.fc-timegrid-event,
 .calendar-view a.fc-daygrid-event,
-.calendar-view .fc-daygrid-dot-event .fc-event-title {
+.fc-daygrid-dot-event .fc-event-title {
     font-weight: 500;
 }
 
+.calendar-view a.fc-timegrid-event:focus-visible,
+.calendar-view a.fc-daygrid-event:focus-visible {
+    outline: none;
+}
+
 .calendar-view a.fc-timegrid-event,
 .calendar-view a.fc-daygrid-event {
     --border-color: transparent;
@@ -136,20 +137,6 @@ body.desktop:not(.zen) .calendar-view .calendar-header {
     padding-left: 8px;
 }
 
-.calendar-view .fc-timegrid-event.with-hue,
-.calendar-view .fc-daygrid-event.with-hue {
-    --fc-event-text-color: var(--custom-color);
-
-    --fc-event-bg-color: hsl(var(--custom-color-hue),
-                    var(--calendar-coll-event-background-saturation),
-                    var(--calendar-coll-event-background-lightness)) !important;
-}
-
-.calendar-view a.fc-timegrid-event:focus-visible,
-.calendar-view a.fc-daygrid-event:focus-visible {
-    outline: none;
-}
-
 .calendar-view a.fc-timegrid-event.fc-event-selected,
 .calendar-view a.fc-timegrid-event.fc-event:focus,
 .calendar-view a.fc-daygrid-event.fc-event-selected,
@@ -166,26 +153,21 @@ body.desktop:not(.zen) .calendar-view .calendar-header {
     opacity: 1;
 }
 
-.calendar-view .fc-daygrid-event-dot {
+.calendar-view .fc-timegrid-event.with-hue,
-    display: none;
+.calendar-view .fc-daygrid-event.with-hue {
-}
+    --fc-event-text-color: var(--custom-color);
 
+    --fc-event-bg-color: hsl(var(--custom-color-hue),
+                    var(--calendar-coll-event-background-saturation),
+                    var(--calendar-coll-event-background-lightness)) !important;
+}
 
 .calendar-view .fc-event-time {
     opacity: .75;
 }
 
-/* 
+.fc-daygrid-event-dot {
- * List view
+    display: none;
- */
-
-.fc-list-table tr.fc-event.archived {
-    opacity: .5;
-}
-
-.fc-list-table .fc-list-event-dot {
-    /* Apply note colors to the list item dots */
-    --fc-event-border-color: var(--custom-color);
 }
 
 /* #endregion */

docs/User Guide/User Guide/Collections/Calendar.md

@@ -63,7 +63,7 @@ For each note of the calendar, the following attributes can be used:
 | `#startTime` | The time the event starts at. If this value is missing, then the event is considered a full-day event. The format is `HH:MM` (hours in 24-hour format and minutes). |
 | `#endTime` | Similar to `startTime`, it mentions the time at which the event ends (in relation with `endDate` if present, or `startDate`). |
 | `#color` | Displays the event with a specified color (named such as `red`, `gray` or hex such as `#FF0000`). This will also change the color of the note in other places such as the note tree. |
-| `#calendar:color` | Similar to `#color`, but applies the color only for the event in the calendar and not for other places such as the note tree. (*Deprecated*) |
+| `#calendar:color` | Similar to `#color`, but applies the color only for the event in the calendar and not for other places such as the note tree. |
 | `#iconClass` | If present, the icon of the note will be displayed to the left of the event title. |
 | `#calendar:title` | Changes the title of an event to point to an attribute of the note other than the title, can either a label or a relation (without the `#` or `~` symbol). See _Use-cases_ for more information. |
 | `#calendar:displayedAttributes` | Allows displaying the value of one or more attributes in the calendar like this:      <br>  <br>![](9_Calendar_image.png)     <br>  <br>`#weight="70" #Mood="Good" #calendar:displayedAttributes="weight,Mood"`    <br>  <br>It can also be used with relations, case in which it will display the title of the target note:     <br>  <br>`~assignee=@My assignee #calendar:displayedAttributes="assignee"` |

packages/ckeditor5-math/package.json

@@ -25,6 +25,7 @@
   ],
   "devDependencies": {
     "@ckeditor/ckeditor5-dev-build-tools": "43.1.0",
+    "@ckeditor/ckeditor5-dev-utils": "43.1.0",
     "@ckeditor/ckeditor5-inspector": ">=4.1.0",
     "@ckeditor/ckeditor5-package-tools": "5.0.1",
     "@typescript-eslint/eslint-plugin": "~8.48.0",