diff options
| author | dave <starpumadev@gmail.com> | 2019-04-02 10:07:36 -0400 |
|---|---|---|
| committer | dave <starpumadev@gmail.com> | 2019-04-02 10:07:36 -0400 |
| commit | 8b3f037f877e1bd8a77f925e4d9d06b45addee8b (patch) | |
| tree | 3cb4e2df8b21c8673971a2f69e4e6588305c2ae7 /src/components/notifications | |
| parent | 6482201dc9e54d458bec48794260ffa1749c512b (diff) | |
| parent | ac28e8c2f981b6584f0103e10b0a5f5b025fcaae (diff) | |
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
Diffstat (limited to 'src/components/notifications')
| -rw-r--r-- | src/components/notifications/notifications.js | 3 | ||||
| -rw-r--r-- | src/components/notifications/notifications.vue | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js index e1c53c58..375e4751 100644 --- a/src/components/notifications/notifications.js +++ b/src/components/notifications/notifications.js @@ -7,6 +7,9 @@ import { } from '../../services/notification_utils/notification_utils.js' const Notifications = { + props: [ + 'noHeading' + ], created () { const store = this.$store const credentials = store.state.users.currentUser.credentials diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue index 37104b90..88775be1 100644 --- a/src/components/notifications/notifications.vue +++ b/src/components/notifications/notifications.vue @@ -1,7 +1,7 @@ <template> <div class="notifications"> <div class="panel panel-default"> - <div class="panel-heading"> + <div v-if="!noHeading" class="panel-heading"> <div class="title"> {{$t('notifications.notifications')}} <span class="badge badge-notification unseen-count" v-if="unseenCount">{{unseenCount}}</span> |