diff options
| author | Rinpatch <rinpatch@sdf.org> | 2018-12-13 17:22:19 +0300 |
|---|---|---|
| committer | Rinpatch <rinpatch@sdf.org> | 2018-12-13 17:22:19 +0300 |
| commit | 6de4dcc7c99e14552303e5eee7dac31dd5e58e2e (patch) | |
| tree | 668904f3dba16ab39f683345b2e979e57696db94 /src/components/notifications/notifications.vue | |
| parent | 48edc0c8fcc6c63e432c9b6d78f14af086b56900 (diff) | |
| parent | 8e4777ccc6bf72b56a0905ca491c8e0e97fb73cf (diff) | |
Resolve merge conflict
Diffstat (limited to 'src/components/notifications/notifications.vue')
| -rw-r--r-- | src/components/notifications/notifications.vue | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue index 7a4322f9..bef48567 100644 --- a/src/components/notifications/notifications.vue +++ b/src/components/notifications/notifications.vue @@ -4,7 +4,7 @@ <div class="panel-heading"> <div class="title"> {{$t('notifications.notifications')}} - <span class="unseen-count" v-if="unseenCount">{{unseenCount}}</span> + <span class="badge badge-notification unseen-count" v-if="unseenCount">{{unseenCount}}</span> </div> <div @click.prevent class="loadmore-error alert error" v-if="error"> {{$t('timeline.error_fetching')}} @@ -13,7 +13,8 @@ </div> <div class="panel-body"> <div v-for="notification in visibleNotifications" :key="notification.action.id" class="notification" :class='{"unseen": !notification.seen}'> - <notification :notification="notification"></notification> + <div class="notification-overlay"></div> + <notification :activatePanel="activatePanel" :notification="notification"></notification> </div> </div> <div class="panel-footer"> |