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

Unverified Commit d7d8dab4 authored by Thomas Citharel's avatar Thomas Citharel
Browse files

Show attendee icon on event and reenable notification icon too



Closes #3162

Signed-off-by: default avatarThomas Citharel <tcit@tcit.fr>
parent 6d8c4603
Loading
Loading
Loading
Loading
+53 −6
Original line number Diff line number Diff line
@@ -156,19 +156,66 @@
	}

	// Reminder icon on events with alarms set
	.fc-event-nc-alarms {
		.icon-event-reminder {
	&.fc-event-nc-alarms, &.fc-event-nc-attendees {
		.icon-event-reminder, .icon-event-attendee {
			background-color: inherit;
			background-position: right;
			position: absolute;
			top: 0;
			top: 2px;
			right: 0;
			&--light {
		}
	}

	// Reminder icon on calendar color background
	&.fc-event-nc-alarms {
		.icon-event-reminder--light {
			background-image: var(--icon-calendar-reminder-fffffe)
		}
			&--dark {
		.icon-event-reminder--dark {
			background-image: var(--icon-calendar-reminder-000001)
		}
	}

	// Reminder icon on theme background
	&.fc-list-event, &.fc-daygrid-dot-event {
		&.fc-event-nc-alarms {
			.icon-event-reminder--light {
				background-image: var(--icon-calendar-reminder-000001)
			}

			.icon-event-reminder--dark {
				background-image: var(--icon-calendar-reminder-fffffe)
			}
		}
	}

	// Attendee icon on events with attendees
	&.fc-event-nc-alarms, &.fc-event-nc-attendees {
		.icon-event-reminder + .icon-event-attendee {
			right: 15px;
		}
	}

	// Attendee icon on calendar color background
	&.fc-event-nc-attendees {
		.icon-event-attendee--light {
			background-image: var(--icon-calendar-attendee-fffffe)
		}
		.icon-event-attendee--dark {
			background-image: var(--icon-calendar-attendee-000001)
		}
	}

	// Attendee icon on theme background
	&.fc-list-event, &.fc-daygrid-dot-event {
		&.fc-event-nc-attendees {
			.icon-event-attendee--light {
				background-image: var(--icon-calendar-attendee-000001)
			}

			.icon-event-attendee--dark {
				background-image: var(--icon-calendar-attendee-fffffe)
			}
		}
	}

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@
// TODO: Use icon svg api instead of mixins when the server drops scss compilation.
// https://docs.nextcloud.com/server/latest/developer_manual/design/icons.html#svg-color-api

@include icon-black-white('attendee', 'calendar', 1);
@include icon-black-white('briefcase', 'calendar', 5);
@include icon-black-white('circle', 'calendar', 1);
@include icon-black-white('color-picker', 'calendar', 1);
@@ -45,3 +46,5 @@
@include icon-black-white('view-week', 'calendar', 1);
@include icon-color('reminder', 'calendar', '#fffffe', 1);
@include icon-color('reminder', 'calendar', '#000001', 1);
@include icon-color('attendee', 'calendar', '#fffffe', 1);
@include icon-color('attendee', 'calendar', '#000001', 1);
+5 −0
Original line number Diff line number Diff line
# Licenses

## attendee.svg
- Created by: Google (modified)
- License: Apache License Version 2.0
- Link: https://fonts.google.com/icons?selected=Material%20Icons%3Agroup%3A

## briefcase.svg
- Created by: [Oriza Creative](https://thenounproject.com/orizacreativa)
- License: CC-BY

img/attendee.svg

0 → 100644
+3 −0
Original line number Diff line number Diff line
<svg style="width:24px;height:24px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
	<path d="M16 17V19H2V17S2 13 9 13 16 17 16 17M12.5 7.5A3.5 3.5 0 1 0 9 11A3.5 3.5 0 0 0 12.5 7.5M15.94 13A5.32 5.32 0 0 1 18 17V19H22V17S22 13.37 15.94 13M15 4A3.39 3.39 0 0 0 13.07 4.59A5 5 0 0 1 13.07 10.41A3.39 3.39 0 0 0 15 11A3.5 3.5 0 0 0 15 4Z" />
</svg>
+4 −0
Original line number Diff line number Diff line
@@ -119,6 +119,10 @@ export function eventSourceFunction(calendarObjects, calendar, start, end, timez
				}
			}

			if (object.getAttendeeList().length > 0) {
				classNames.push('fc-event-nc-attendees')
			}

			const fcEvent = {
				id: [calendarObject.id, object.id].join('###'),
				title,
Loading