mirror of
https://github.com/cryptpad/cryptpad.git
synced 2026-09-12 19:49:59 +05:00
Merge pull request #1721 from cryptpad/calendar_reminders_notif_panel
Calendar reminders in notification panel
This commit is contained in:
commit
07beefe117
@ -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;
|
||||
}
|
||||
|
||||
@ -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);
|
||||
},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user