Skip to content

Commit

Permalink
fix(NotificationsApp): Fix 'Dismiss all' on the bottom
Browse files Browse the repository at this point in the history
- this partially reverts commit d886223

Signed-off-by: Maksim Sukharev <[email protected]>
  • Loading branch information
Antreesy authored and backportbot[bot] committed Jan 27, 2025
1 parent da39629 commit 18f3ddd
Showing 1 changed file with 14 additions and 12 deletions.
26 changes: 14 additions & 12 deletions src/NotificationsApp.vue
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

0 comments on commit 18f3ddd

Please sign in to comment.