Merge pull request #5392 from nextcloud/backport/5391/stable4.4

[stable4.4] Fix navigation toggle overlap
nextcloud · Aug 3, 2023 · c921c04 · c921c04
2 parents dba2256 + d4966de
commit c921c04
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/css/app-navigation.scss b/css/app-navigation.scss
@@ -108,6 +108,11 @@
 	}
 }
 
+// Add background to navigation toggle to fix overlap with calendar elements
+.app-navigation-toggle {
+	background-color: var(--color-main-background) !important;
+}
+
 .app-navigation {
 	button.icon-share {
 		opacity: 0.3 !important;

diff --git a/css/fullcalendar.scss b/css/fullcalendar.scss
@@ -116,6 +116,16 @@
 	word-break: break-word;
 }
 
+// Prevent events overlapping over day header
+.fc .fc-list-sticky .fc-list-day > * {
+	z-index: 1;
+}
+
+// Padding to account for left navigation toggle
+.fc-list-table .fc-list-day-cushion {
+	padding-left: calc(var(--default-clickable-area) + var(--default-grid-baseline) * 2);
+}
+
 // highlight current day (exclude day view)
 .fc-timeGridWeek-view,
 .fc-dayGridMonth-view {