diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-07-31 17:57:32 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-07-31 17:57:32 +0000 |
| commit | 33ad712852088f8b99a82ec561733d41d63b0034 (patch) | |
| tree | 75eea24b29b4204b57e38aec8223e91a1f1526fe /src/components/status/status.js | |
| parent | 0b88c56aa674ad19be7e7e883a3687ec89569940 (diff) | |
| parent | 36aae1635ad370ecf4d22ae6d62cbbba6af19fd3 (diff) | |
Merge branch 'disjointed-popovers' into 'develop'
Disjointed popovers
See merge request pleroma/pleroma-fe!1540
Diffstat (limited to 'src/components/status/status.js')
| -rw-r--r-- | src/components/status/status.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js index a925f30b..053c9441 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -4,13 +4,13 @@ import ReactButton from '../react_button/react_button.vue' import RetweetButton from '../retweet_button/retweet_button.vue' import ExtraButtons from '../extra_buttons/extra_buttons.vue' import PostStatusForm from '../post_status_form/post_status_form.vue' -import UserCard from '../user_card/user_card.vue' import UserAvatar from '../user_avatar/user_avatar.vue' import AvatarList from '../avatar_list/avatar_list.vue' import Timeago from '../timeago/timeago.vue' import StatusContent from '../status_content/status_content.vue' import RichContent from 'src/components/rich_content/rich_content.jsx' import StatusPopover from '../status_popover/status_popover.vue' +import UserPopover from '../user_popover/user_popover.vue' import UserListPopover from '../user_list_popover/user_list_popover.vue' import EmojiReactions from '../emoji_reactions/emoji_reactions.vue' import MentionsLine from 'src/components/mentions_line/mentions_line.vue' @@ -105,7 +105,6 @@ const Status = { RetweetButton, ExtraButtons, PostStatusForm, - UserCard, UserAvatar, AvatarList, Timeago, @@ -115,7 +114,8 @@ const Status = { StatusContent, RichContent, MentionLink, - MentionsLine + MentionsLine, + UserPopover }, props: [ 'statusoid', |
