diff options
| author | Henry Jameson <me@hjkos.com> | 2022-07-31 11:44:15 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2022-07-31 11:44:15 +0300 |
| commit | 1cf7af33741ee43aff9e597f0a69f62f7d660cf6 (patch) | |
| tree | 75eea24b29b4204b57e38aec8223e91a1f1526fe /src/components/notification | |
| parent | 0b88c56aa674ad19be7e7e883a3687ec89569940 (diff) | |
| parent | 36aae1635ad370ecf4d22ae6d62cbbba6af19fd3 (diff) | |
Merge branch 'disjointed-popovers' into eslint-update
* disjointed-popovers: (56 commits)
fix typo
fix errors in console
pinned no longer needed
popover stack
add stay-on-click prop to solve case of clicking user avatar in status popover
fix settings tooltips
vertical nudge for popovers, especially for overlay-centers ones
make user popover options expert
use same sizing for timeline dropdown as in the main nav
fix avatar not zooming in profile page
fix spacing in mentionsline
add popovers to chats
fix avatar not closing, add option to put popovers next to avatar instead of over it
fix the incorrect rounding in nav list
re-unfuck the timeline popover
Revert "unify styling of timelines dropdown with other dropdown menus"
close on avatar click again, add zooming as option
fix basicusercard
make hover popovers less annoying to close
move tooltips setting
...
Diffstat (limited to 'src/components/notification')
| -rw-r--r-- | src/components/notification/notification.js | 4 | ||||
| -rw-r--r-- | src/components/notification/notification.vue | 25 |
2 files changed, 16 insertions, 13 deletions
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js index 398bb7a9..77cdfa73 100644 --- a/src/components/notification/notification.js +++ b/src/components/notification/notification.js @@ -5,6 +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 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' @@ -46,7 +47,8 @@ const Notification = { UserCard, Timeago, Status, - RichContent + RichContent, + UserPopover }, methods: { toggleUserExpanded () { diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue index 7d3d0c69..6427d117 100644 --- a/src/components/notification/notification.vue +++ b/src/components/notification/notification.vue @@ -34,21 +34,22 @@ <a class="avatar-container" :href="$router.resolve(userProfileLink).href" - @click.stop.prevent.capture="toggleUserExpanded" + @click.prevent > - <UserAvatar - :compact="true" - :better-shadow="betterShadow" - :user="notification.from_profile" - /> + <UserPopover + :userId="notification.from_profile.id" + :overlayCenters="true" + > + <UserAvatar + class="post-avatar" + :bot="botIndicator" + :compact="true" + :better-shadow="betterShadow" + :user="notification.from_profile" + /> + </UserPopover> </a> <div class="notification-right"> - <UserCard - v-if="userExpanded" - :user-id="getUser(notification).id" - :rounded="true" - :bordered="true" - /> <span class="notification-details"> <div class="name-and-action"> <!-- eslint-disable vue/no-v-html --> |
