diff --git a/.stylelintignore b/.stylelintignore new file mode 100644 index 000000000..c01a6674e --- /dev/null +++ b/.stylelintignore @@ -0,0 +1 @@ +src/fonts \ No newline at end of file diff --git a/src/components/AppNavigation/AppNavigationHeader/AppNavigationHeaderDatePicker.vue b/src/components/AppNavigation/AppNavigationHeader/AppNavigationHeaderDatePicker.vue index 44f0f02fb..5a8d62869 100644 --- a/src/components/AppNavigation/AppNavigationHeader/AppNavigationHeaderDatePicker.vue +++ b/src/components/AppNavigation/AppNavigationHeader/AppNavigationHeaderDatePicker.vue @@ -73,7 +73,7 @@ export default { filters: { formatDateRage, }, - data: function() { + data() { return { isDatepickerOpen: false, } diff --git a/src/components/AppNavigation/CalendarList.vue b/src/components/AppNavigation/CalendarList.vue index 7f81e2556..9a28589a0 100644 --- a/src/components/AppNavigation/CalendarList.vue +++ b/src/components/AppNavigation/CalendarList.vue @@ -39,9 +39,9 @@ :calendar="calendar" /> - + diff --git a/src/components/AppNavigation/CalendarList/CalendarListItem.vue b/src/components/AppNavigation/CalendarList/CalendarListItem.vue index bdcc825e5..5da8a294b 100644 --- a/src/components/AppNavigation/CalendarList/CalendarListItem.vue +++ b/src/components/AppNavigation/CalendarList/CalendarListItem.vue @@ -183,7 +183,7 @@ export default { required: true, }, }, - data: function() { + data() { return { // Rename action showRenameLabel: true, diff --git a/src/components/AppNavigation/CalendarList/CalendarListNew.vue b/src/components/AppNavigation/CalendarList/CalendarListNew.vue index 2d26cf212..d64876581 100644 --- a/src/components/AppNavigation/CalendarList/CalendarListNew.vue +++ b/src/components/AppNavigation/CalendarList/CalendarListNew.vue @@ -101,7 +101,7 @@ export default { ActionText, AppNavigationItem, }, - data: function() { + data() { return { // Open state isOpen: false, diff --git a/src/components/AppNavigation/CalendarList/PublicCalendarListItem.vue b/src/components/AppNavigation/CalendarList/PublicCalendarListItem.vue index 6d4962219..b206d3365 100644 --- a/src/components/AppNavigation/CalendarList/PublicCalendarListItem.vue +++ b/src/components/AppNavigation/CalendarList/PublicCalendarListItem.vue @@ -104,7 +104,7 @@ export default { required: true, }, }, - data: function() { + data() { return { // copy subscription link: showCopySubscriptionLinkLabel: true, diff --git a/src/components/AppNavigation/CalendarList/Trashbin.vue b/src/components/AppNavigation/CalendarList/Trashbin.vue index 3b60de962..e49769bb7 100644 --- a/src/components/AppNavigation/CalendarList/Trashbin.vue +++ b/src/components/AppNavigation/CalendarList/Trashbin.vue @@ -236,19 +236,24 @@ export default { max-width: 40vw; margin: 2vw; } + table { width: 100%; } + th, td { padding: 4px; } + th { color: var(--color-text-maxcontrast) } + .name { // Take remaining width to prevent whitespace on the right side width: 100vw; } + .item { display: flex; @@ -256,15 +261,18 @@ th { color: var(--color-text-maxcontrast) } } + .deletedAt { text-align: right; } + .footer { color: var(--color-text-lighter); text-align: center; font-size: small; margin-top: 16px; } + .color-dot { display: inline-block; vertical-align: middle; diff --git a/src/components/AppNavigation/Settings.vue b/src/components/AppNavigation/Settings.vue index 80e737740..942e86971 100644 --- a/src/components/AppNavigation/Settings.vue +++ b/src/components/AppNavigation/Settings.vue @@ -157,7 +157,7 @@ export default { default: false, }, }, - data: function() { + data() { return { savingBirthdayCalendar: false, savingEventLimit: false, diff --git a/src/components/AppNavigation/Settings/ImportScreenRow.vue b/src/components/AppNavigation/Settings/ImportScreenRow.vue index f90ee59e2..1bb8ba074 100644 --- a/src/components/AppNavigation/Settings/ImportScreenRow.vue +++ b/src/components/AppNavigation/Settings/ImportScreenRow.vue @@ -68,6 +68,8 @@ export default { return this.$store.getters.getCalendarById(calendarId) }, calendars() { + // TODO: remove once the false positive is fixed upstream + // eslint-disable-next-line vue/no-side-effects-in-computed-properties const calendars = this.$store.getters.sortedCalendarFilteredByComponents( this.file.parser.containsVEvents(), this.file.parser.containsVJournals(), diff --git a/src/components/Editor/Alarm/AlarmTimeUnitSelect.vue b/src/components/Editor/Alarm/AlarmTimeUnitSelect.vue index 59201c405..cb9148ba5 100644 --- a/src/components/Editor/Alarm/AlarmTimeUnitSelect.vue +++ b/src/components/Editor/Alarm/AlarmTimeUnitSelect.vue @@ -71,29 +71,29 @@ export default { if (this.unit === 'seconds') { options.push({ - 'label': this.$n('calendar', 'second', 'seconds', this.count), - 'unit': 'seconds', + label: this.$n('calendar', 'second', 'seconds', this.count), + unit: 'seconds', }) } if (!this.isAllDay || ['minutes', 'hours'].indexOf(this.unit) !== -1) { options.push({ - 'label': this.$n('calendar', 'minute', 'minutes', this.count), - 'unit': 'minutes', + label: this.$n('calendar', 'minute', 'minutes', this.count), + unit: 'minutes', }) options.push({ - 'label': this.$n('calendar', 'hour', 'hours', this.count), - 'unit': 'hours', + label: this.$n('calendar', 'hour', 'hours', this.count), + unit: 'hours', }) } options.push({ - 'label': this.$n('calendar', 'day', 'days', this.count), - 'unit': 'days', + label: this.$n('calendar', 'day', 'days', this.count), + unit: 'days', }) options.push({ - 'label': this.$n('calendar', 'week', 'weeks', this.count), - 'unit': 'weeks', + label: this.$n('calendar', 'week', 'weeks', this.count), + unit: 'weeks', }) return options diff --git a/src/components/Editor/FreeBusy/FreeBusy.vue b/src/components/Editor/FreeBusy/FreeBusy.vue index 9f59e19ba..f78dc41cd 100644 --- a/src/components/Editor/FreeBusy/FreeBusy.vue +++ b/src/components/Editor/FreeBusy/FreeBusy.vue @@ -172,7 +172,7 @@ export default { let title = attendee.commonName || attendee.uri.substr(7) if (attendee === this.organizer) { title = this.$t('calendar', '{organizer} (organizer)', { - organizer: title + organizer: title, }) } diff --git a/src/components/Editor/Invitees/AvatarParticipationStatus.vue b/src/components/Editor/Invitees/AvatarParticipationStatus.vue index 3ae012c4f..a55dd5f6b 100644 --- a/src/components/Editor/Invitees/AvatarParticipationStatus.vue +++ b/src/components/Editor/Invitees/AvatarParticipationStatus.vue @@ -150,6 +150,7 @@ export default { opacity: .45; position: relative; } + .avatar-participation-status__text { opacity: .45; left: 69px; diff --git a/src/components/Editor/Invitees/InviteesListItem.vue b/src/components/Editor/Invitees/InviteesListItem.vue index 3ecfb30ef..39bd9ddf2 100644 --- a/src/components/Editor/Invitees/InviteesListItem.vue +++ b/src/components/Editor/Invitees/InviteesListItem.vue @@ -180,6 +180,7 @@ export default { .invitees-list-item__displayname { margin-bottom: 17px; } + .avatar-participation-status { margin-top: 5px; } diff --git a/src/components/Editor/Invitees/InviteesListSearch.vue b/src/components/Editor/Invitees/InviteesListSearch.vue index 7ad1b77ff..43981f1e6 100644 --- a/src/components/Editor/Invitees/InviteesListSearch.vue +++ b/src/components/Editor/Invitees/InviteesListSearch.vue @@ -193,7 +193,7 @@ export default { arr.push({ calendarUserType: 'INDIVIDUAL', commonName: result.name, - email: email, + email, isUser: false, avatar: result.photo, language: result.lang, @@ -221,7 +221,7 @@ export default { } if (this.alreadyInvitedEmails.includes(principal.email)) { - return + return false } // We do not support GROUPS for now diff --git a/src/components/Editor/Invitees/OrganizerListItem.vue b/src/components/Editor/Invitees/OrganizerListItem.vue index e8ebb1451..f98016483 100644 --- a/src/components/Editor/Invitees/OrganizerListItem.vue +++ b/src/components/Editor/Invitees/OrganizerListItem.vue @@ -87,6 +87,7 @@ export default { .invitees-list-item__displayname { margin-bottom: 13px; } + .invitees-list-item__organizer-hint { margin-bottom: 14px; } diff --git a/src/components/Editor/Repeat/RepeatFreqSelect.vue b/src/components/Editor/Repeat/RepeatFreqSelect.vue index 3d0b2d754..3fa67d9fe 100644 --- a/src/components/Editor/Repeat/RepeatFreqSelect.vue +++ b/src/components/Editor/Repeat/RepeatFreqSelect.vue @@ -51,20 +51,20 @@ export default { computed: { options() { return [{ - 'label': this.$t('calendar', 'never'), - 'freq': 'NONE', + label: this.$t('calendar', 'never'), + freq: 'NONE', }, { - 'label': this.$n('calendar', 'day', 'days', this.count), - 'freq': 'DAILY', + label: this.$n('calendar', 'day', 'days', this.count), + freq: 'DAILY', }, { - 'label': this.$n('calendar', 'week', 'weeks', this.count), - 'freq': 'WEEKLY', + label: this.$n('calendar', 'week', 'weeks', this.count), + freq: 'WEEKLY', }, { - 'label': this.$n('calendar', 'month', 'months', this.count), - 'freq': 'MONTHLY', + label: this.$n('calendar', 'month', 'months', this.count), + freq: 'MONTHLY', }, { - 'label': this.$n('calendar', 'year', 'years', this.count), - 'freq': 'YEARLY', + label: this.$n('calendar', 'year', 'years', this.count), + freq: 'YEARLY', }] }, selected() { diff --git a/src/components/Shared/CalendarPicker.vue b/src/components/Shared/CalendarPicker.vue index 4605d1ba3..8244c0aed 100644 --- a/src/components/Shared/CalendarPicker.vue +++ b/src/components/Shared/CalendarPicker.vue @@ -6,10 +6,10 @@ :options="calendars" :value="calendar" @select="change"> -