Skip to content

Commit

Permalink
Merge pull request #3052 from nextcloud/fix/focus-trap
Browse files Browse the repository at this point in the history
eliminate focus-trap console errors and fix styling of auto reminder information
  • Loading branch information
dartcafe authored Sep 5, 2023
2 parents 47e824d + 81080b9 commit 3ed8cb3
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/js/components/Calendar/CalendarPeek.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
-->

<template>
<NcPopover v-if="events.length" class="calendar-peek">
<NcPopover v-if="events.length" :focus-trap="false" class="calendar-peek">
<template #trigger>
<div>
<div class="calendar-peek__conflict icon icon-calendar" />
Expand Down
35 changes: 21 additions & 14 deletions src/js/components/Configuration/AutoReminderInformation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,23 @@

<template lang="html">
<div class="auto-reminder-information">
<p> {{ t('polls', 'The automatic reminder is sent to all shares via email:') }} </p>
<p> 1. {{ t('polls', 'For polls with expiration:') }} </p>
<h1> {{ t('polls', 'The automatic reminder is sent to all shares via email:') }} </h1>
<h2> {{ t('polls', 'For polls with expiration:') }} </h2>
<ul>
<li> - {{ t('polls', '48 hours before the expiration date, if the poll is created more than 5 days before the expiration.') }}</li>
<li> - {{ t('polls', '36 hours before the expiration date, if the poll is created more than 2 and less than 5 days before the expiration.') }}</li>
<li> {{ t('polls', '48 hours before the expiration date, if the poll is created more than 5 days before the expiration.') }}</li>
<li> {{ t('polls', '36 hours before the expiration date, if the poll is created more than 2 and less than 5 days before the expiration.') }}</li>
</ul>
<p> &nbsp; </p>
<p> 2. {{ t('polls', 'For date polls without expiration:') }} </p>
<h2> {{ t('polls', 'For date polls without expiration:') }} </h2>
<ul>
<li> - {{ t('polls', '48 hours before the first date option, if the poll is created more than 5 days before the first date option.') }}</li>
<li> - {{ t('polls', '36 hours before the first date option, if the poll is created more than 2 and less than 5 days before the first date option.') }}</li>
<li> {{ t('polls', '48 hours before the first date option, if the poll is created more than 5 days before the first date option.') }}</li>
<li> {{ t('polls', '36 hours before the first date option, if the poll is created more than 2 and less than 5 days before the first date option.') }}</li>
</ul>
<p> &nbsp; </p>
<p> 3. {{ t('polls', 'No reminder is sent:') }} </p>
<h2> {{ t('polls', 'No reminder is sent:') }} </h2>
<ul>
<li> - {{ t('polls', 'For text polls without expiration.') }}</li>
<li> - {{ t('polls', 'For polls created less than 2 days before the expiration.') }}</li>
<li> - {{ t('polls', 'If a share already got a reminder (no matter, if the expiration date got changed).') }}</li>
<li> - {{ t('polls', 'If the poll is already closed.') }}</li>
<li> {{ t('polls', 'For text polls without expiration.') }}</li>
<li> {{ t('polls', 'For polls created less than 2 days before the expiration.') }}</li>
<li> {{ t('polls', 'If a share already got a reminder (no matter, if the expiration date got changed).') }}</li>
<li> {{ t('polls', 'If the poll is already closed.') }}</li>
</ul>
</div>
</template>
Expand All @@ -54,6 +52,15 @@ export default {
<style lang="scss">
.auto-reminder-information {
padding: 8px;
* {
margin: revert;
padding: revert;
font-size: revert;
text-decoration: revert;
list-style: revert;
opacity: revert;
min-height: revert;
}
}

</style>
2 changes: 1 addition & 1 deletion src/js/components/Configuration/ConfigAutoReminder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<NcCheckboxRadioSwitch :checked.sync="autoReminder" type="switch">
{{ t('polls', 'Use Autoreminder') }}
</NcCheckboxRadioSwitch>
<NcPopover>
<NcPopover :focus-trap="false">
<template #trigger>
<NcActions>
<NcActionButton>
Expand Down
2 changes: 1 addition & 1 deletion src/js/components/Poll/PollHeaderButtons.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<template>
<div class="poll-header-buttons">
<UserMenu v-if="showUserMenu" />
<NcPopover>
<NcPopover :focus-trap="false">
<template #trigger>
<NcButton v-tooltip="caption"
:aria-label="caption"
Expand Down

0 comments on commit 3ed8cb3

Please sign in to comment.