Skip to content

[stable29] fix: style and template fixes #2224

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
Antreesy merged 6 commits into from
Mar 21, 2025
Merged

[stable29] fix: style and template fixes #2224

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6f82c77
fix: extract IconNotification to separate component
Antreesy Sep 12, 2024
a5a8a4c
fix: rewrite IconNotification to script setup, refactor code
Antreesy Sep 12, 2024
9e97334
fix(style): clear excessive and redundant styles
Antreesy Dec 23, 2024
d42c989
fix(NotificationsApp): ease template
Antreesy Dec 23, 2024
76a745f
fix(NotificationsApp): Fix 'Dismiss all' on the bottom
Antreesy Jan 27, 2025
a9346d9
chore(assets): Recompile assets
nextcloud-command Feb 24, 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
Prev Previous commit
Next Next commit
fix(NotificationsApp): Fix 'Dismiss all' on the bottom 
Signed-off-by: Maksim Sukharev <[email protected]>
  • Loading branch information
@Antreesy
Antreesy committed Feb 24, 2025
commit 76a745ff9a389f8a735f38bbbcbcf335b04e8271
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 @@ -34,17 +34,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 @@ -69,6 +58,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 @@ -485,12 +486,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