diff options
| author | Henry Jameson <me@hjkos.com> | 2022-06-20 23:57:44 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2022-06-20 23:57:44 +0300 |
| commit | 01e56a3e10b9d77e2f5a7fa7c13ce3afbed468d4 (patch) | |
| tree | 3365827000d96abd1e1c8e869cafc99593d8bec1 /src/components/notification/notification.js | |
| parent | cb89646c56288f42896d34e3b405621e08c88575 (diff) | |
| parent | 60571685c2e42e44b75157c3d52f162bf39c4bab (diff) | |
Merge remote-tracking branch 'origin/disjointed-popovers' into disjointed-popovers
* origin/disjointed-popovers:
popover controls for user-card
unify user popovers into a separate component
Diffstat (limited to 'src/components/notification/notification.js')
| -rw-r--r-- | src/components/notification/notification.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js index 9408b217..77cdfa73 100644 --- a/src/components/notification/notification.js +++ b/src/components/notification/notification.js @@ -5,7 +5,7 @@ import UserAvatar from '../user_avatar/user_avatar.vue' import UserCard from '../user_card/user_card.vue' import Timeago from '../timeago/timeago.vue' import RichContent from 'src/components/rich_content/rich_content.jsx' -import Popover from '../popover/popover.vue' +import UserPopover from '../user_popover/user_popover.vue' import { isStatusNotification } from '../../services/notification_utils/notification_utils.js' import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js' import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator' @@ -48,7 +48,7 @@ const Notification = { Timeago, Status, RichContent, - Popover + UserPopover }, methods: { toggleUserExpanded () { |