The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-12 19:49:59 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 2024.12-rc

Browse Source
This commit is contained in:
yflory 2024-12-16 17:49:11 +01:00
commit 53bc6f2e45
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
www/notifications/app-notifications.less
View File

@ -78,6 +78,7 @@
justify-content: flex-start;
align-items: center;
background-color: @cp_notif-bg;
border-top: 1px solid @cp_notif-table-border;
&.no-notifications {
display: none;
padding: 1rem 1rem;
@ -95,12 +96,14 @@
background-color: @cp_notif-hover;
}
}
.cp-avatar-calendar {
font-size: 45px;
padding: 0 12px;
overflow: hidden;
}
&.cp-app-notification-archived {
background-color: @cp_notif-bg;
}
&:not(:first-child) {
border-top: 1px solid @cp_notif-table-border;
}
&.dismissed {
display: none;
}

4
www/notifications/inner.js
View File

@ -87,6 +87,8 @@ define([
// if the type of notification correspond
if (filterTypes.indexOf(data.content.msg.type) !== -1) {
notifsData.push(data);
var icon = $(el).find(".cp-reminder");
$(icon).addClass('cp-avatar-calendar');
$(notifsList).prepend(el);
}
};
@ -143,7 +145,7 @@ define([
$(loadmore).click();
}
common.mailbox.subscribe(["notifications"], {
common.mailbox.subscribe(["notifications", "reminders"], {
onMessage: function (data, el) {
addNotification(data, el);
},