Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 25e85234 authored by Georg Ehrke's avatar Georg Ehrke Committed by GitHub
Browse files

Merge pull request #2498 from nextcloud/dependageorg/npm_and_yarn/fullcalendar_5.3 

Update to FullCalendar 5.3
parents 441d7968 78132a97

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ vendor/ 
build/

js/

node_modules/

src/fonts

*.clover



# just sane ignores

.stylelintignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
/src/fonts

css/app-sidebar.scss

+1 −2
Original line number Diff line number Diff line
@@ -627,12 +627,11 @@ 
}



.event-popover {

	padding: 5px 8px;



	.popover__inner {

		text-align: left;

		max-width: 450px;

		width: 450px;

		padding: 5px 8px;



		.illustration-header {

			height: 100px;

css/fullcalendar.scss

+102 −177
Original line number Diff line number Diff line 
/**

 * Calendar App

 *

 * @copyright 2019 Georg Ehrke <oc.list@georgehrke.com>

 * @copyright 2020 Georg Ehrke <oc.list@georgehrke.com>

 *

 * @author Georg Ehrke

 *
@@ -20,117 +20,69 @@ 
 *

 */



.fc-event-nc-task-completed,

.fc-event-nc-tentative,

.fc-event-nc-cancelled {

	opacity: .5;

}

/** Override some FullCalendar CSS vars: */

:root {

	--fc-small-font-size: 0.875em;

	--fc-page-bg-color: var(--color-main-background) !important;

	--fc-neutral-bg-color: var(--color-background-dark) !important;

	--fc-neutral-text-color: var(--color-text-lighter) !important;

	--fc-border-color: var(--color-border) !important;



.fc-event-nc-task-completed,

.fc-event-nc-cancelled {

	text-decoration: line-through !important;

}

	--fc-event-bg-color: var(--color-primary);

	--fc-event-border-color: var(--color-primary-text);

	--fc-event-text-color: var(--color-primary-text);

	--fc-event-selected-overlay-color: var(--color-box-shadow);



.fc-view.fc-timeGridDay-view {

	.fc-today {

		background: var(--color-main-background) !important;

	}

}

	--fc-event-resizer-thickness: 8px;

	--fc-event-resizer-dot-total-width: 8px;

	--fc-event-resizer-dot-border-width: 1px;



.fc th,

.fc .fc-axis,

.fc-day-grid-event .fc-time,

.fc-ltr .fc-basic-view .fc-day-number,

.fc-ltr .fc-basic-view .fc-week-number,

.fc-time-grid-event .fc-time {

	opacity: .8;

	font-size: 80%;

	font-weight: normal;

	--fc-non-business-color: var(--color-background-dark);

	--fc-bg-event-color: var(--color-primary);

	--fc-bg-event-opacity: 0.3;

	--fc-highlight-color: rgba(188, 232, 241, 0.3); // TODO - use some color css var from us?

	--fc-today-bg-color: var(--color-main-background) !important;

	--fc-now-indicator-color: red;

}



.fc-basic-view .fc-day-top .fc-week-number {

	background-color: var(--color-border);

	color: var(--color-main-text);

.fc {

	font-family: var(--font-face) !important;

}



// Center date in month view cell

.fc-day-top {

	text-align: center;



	.fc-day-number {

		float: none !important;

		display: inline-block;

	}

// ### FullCalendar Grid adjustments

// Make the labels lighter

.fc-timegrid-axis-frame,

.fc-timegrid-slot-label,

.fc-col-header-cell a {

	color: var(--color-text-lighter) !important;

}



.fc-day-number.fc-other-month {

	opacity: .1 !important;

}



.fc td.fc-widget-header {

	border-top: none;

}



.fc th,

.fc td {

	border-left: none;

	border-bottom: none;

}



/* border styles for grid, highlight full-hour horizontal lines */



.fc-unthemed tr th,

.fc-unthemed tr td {

	border-color: var(--color-border);

	//border-top-color: var(--color-border-dark);

}



.fc-unthemed tr:nth-child(even) td {

	border-top-color: var(--color-border-dark);

}



/* properly size events */

.fc-event {

	font-size: 13px;

	line-height: initial;

	padding-left: 3px;

}



.fc-axis,

.fc-day-header {

	font-size: 100%;

	opacity: .5;

}



.fc td.fc-day.nc-calendar-fc-day-of-weekend {

	background-color: var(--color-background-dark);

}



.fc table {

	white-space: inherit !important;

}



.fc .fc-today {

	opacity: 1;

// Center the date in month view

.fc-daygrid-day-top {

	justify-content: center;

}



// Override Nextcloud styles which highlight table rows on hover

.fc-state-highlight.fc-day-number,

.fc tbody tr,

.fc tbody tr:hover,

.fc tbody tr:focus {

	background: transparent !important;

	background: inherit !important;

}



.fc .fc-divider {

	background: var(--color-border) !important;

	border-color: var(--color-border) !important;

// Today highlighting

.fc-day-today {

	&.fc-col-header-cell {

		a, span {

			background-color: var(--color-primary);

			color: var(--color-primary-text) !important;

			border-radius: var(--border-radius-pill);

			padding: 2px 6px;

			font-weight: bold;

		}



.fc-day-number {

	padding-top: 0 !important;

	}



.fc-today > .fc-day-number {

	.fc-daygrid-day-number {

		background: var(--color-primary);

		color: var(--color-primary-text);

		border-radius: 50%;
@@ -139,17 +91,13 @@ 
		height: 24px;

		text-align: center;

		font-weight: bold !important;

	box-sizing: border-box !important;

		padding: 1px 0 !important;

	}



.fc-day-header.fc-today {

	> a, span {

		background-color: var(--color-primary);

		border-radius: var(--border-radius-pill);

		padding: 2px 6px;

		color: var(--color-primary-text);

		font-weight: bold;

}



// Weekend highlighting

.fc td.fc-day.nc-calendar-fc-day-of-weekend {

	background-color: var(--color-background-dark) !important;

}



.fc-today.nc-calendar-fc-day-of-weekend:not(.fc-day-header) {
@@ -160,24 +108,25 @@ 
	background-color: var(--color-main-background) !important;

}



.nc-calendar-fc-day-of-weekend {

	.fc-week-number {

		background-color: var(--color-background-darker) !important;

		color: var(--color-text-maxcontrast) !important;

	}

// ### FullCalendar Event adjustments

.fc-event {

	padding-left: 3px;



	&.fc-event-nc-task-completed,

	&.fc-event-nc-tentative,

	&.fc-event-nc-cancelled {

		opacity: .5;

	}



.nc-calendar-fc-day-of-workweek {

	.fc-week-number {

		background-color: var(--color-background-dark) !important;

		color: var(--color-text-maxcontrast) !important;

	&.fc-event-nc-task-completed,

	&.fc-event-nc-cancelled {

		.fc-event-title {

			text-decoration: line-through !important;

		}

	}



// The server is setting border-box on everything

// inside content and that messes up fullcalendar

.fc * {

	box-sizing: content-box !important;

	.fc-event-title {

		text-overflow: ellipsis;

	}



	// Reminder icon on events with alarms set
@@ -197,43 +146,19 @@ 
		}

	}



// Task icon on events which are VTODO

.fc-event-nc-task {

	.icon-event-task {

		display: inline-block;

		vertical-align: bottom;

		border: 1px solid black;

		border-radius: 1px;

		margin: 2px 3px 2px 1px;

		min-width: 9px;

		min-height: 9px;

		&--light {

			border-color: #ffffff;

		}

		&--checked--light {

			background-size: 9px;

			@include icon-color('checkmark', 'actions', '#ffffff', 1, true);

		}

		&--dark {

			border-color: #000000;

		}

		&--checked--dark {

			background-size: 9px;

			@include icon-color('checkmark', 'actions', '#000000', 1, true);

		}

	}

}

	// Checkboxes for Tasks

	.fc-event-title-container {

		display: flex;

		align-content: center;



.fc-content {

	background-color: inherit;

	text-overflow: ellipsis;

		.fc-event-title-checkbox {

			margin: 6px 4px 0 0;

			line-height: 1;

		}

	}



.fc-popover.fc-more-popover {

	border-color: var(--color-border-dark) !important;



	> .fc-header.fc-widget-header,

	> .fc-body.fc-widget-content {

		background-color: var(--color-main-background);

	.fc-daygrid-event-checkbox {

		margin: 2px 4px 0 4px;

		line-height: 1;

	}

}

package-lock.json

+1564 −3849

File changed.

Preview size limit exceeded, changes collapsed.