Skip to content

[stable31] fix(NotificationsApp): Fix 'Dismiss all' on the bottom #2173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 2 commits into from
Jan 28, 2025
Merged

[stable31] fix(NotificationsApp): Fix 'Dismiss all' on the bottom #2173

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18f3ddd
fix(NotificationsApp): Fix 'Dismiss all' on the bottom
Antreesy Jan 27, 2025
74c1dc0
chore(assets): Recompile assets
nextcloud-command Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(NotificationsApp): Fix 'Dismiss all' on the bottom 
- this partially reverts commit d886223

Signed-off-by: Maksim Sukharev <[email protected]>
  • Loading branch information
@Antreesy @backportbot
Antreesy authored and backportbot[bot] committed Jan 27, 2025
commit 18f3ddd4f2e3a1ce0ac68ca3d955ce0797c754e1
26 changes: 14 additions & 12 deletions src/NotificationsApp.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,6 @@
v-bind="n"
:index="index"
@remove="onRemove" />
<!-- Dismiss all -->
<li key="dismiss-button" class="dismiss-all">
<NcButton type="tertiary"
wide
@click="onDismissAll">
<template #icon>
<IconClose :size="20" />
</template>
{{ t('notifications', 'Dismiss all notifications') }}
</NcButton>
</li>
</transition-group>

<!-- No notifications -->
Expand All @@ -73,6 +62,18 @@
</template>
</NcEmptyContent>
</transition>

<!-- Dismiss all -->
<div v-if="notifications.length > 0" class="dismiss-all">
<NcButton type="tertiary"
wide
@click="onDismissAll">
<template #icon>
<IconClose :size="20" />
</template>
{{ t('notifications', 'Dismiss all notifications') }}
</NcButton>
</div>
</div>
</NcHeaderMenu>
</template>
Expand Down Expand Up @@ -482,12 +483,13 @@ export default {
.notification-wrapper {
display: flex;
flex-direction: column;
max-height: calc(100vh - 50px * 4);
max-height: calc(100vh - 50px * 5);
overflow: auto;
}

.dismiss-all {
padding: calc(2 * var(--default-grid-baseline));
border-top: 1px solid var(--color-border);
}
}

Expand Down
Loading