diff --git a/components/common/CommonMetaWrapper.vue b/components/common/CommonMetaWrapper.vue deleted file mode 100644 index 378b50e3..00000000 --- a/components/common/CommonMetaWrapper.vue +++ /dev/null @@ -1,5 +0,0 @@ -<template> - <div flex="~" gap-1 items-center> - <slot /> - </div> -</template> diff --git a/components/notification/NotificationCard.vue b/components/notification/NotificationCard.vue index 1d7a0578..686b9ca5 100644 --- a/components/notification/NotificationCard.vue +++ b/components/notification/NotificationCard.vue @@ -44,33 +44,33 @@ const { notification } = defineProps<{ <template v-else-if="notification.type === 'favourite'"> <StatusCard :status="notification.status!" :faded="true"> <template #meta> - <CommonMetaWrapper> + <div flex="~" gap-1 items-center> <div i-ri:heart-fill text-xl mr-1 color-red /> <AccountInlineInfo text-primary font-bold :account="notification.account" mr1 /> - </CommonMetaWrapper> + </div> </template> </StatusCard> </template> <template v-else-if="notification.type === 'reblog'"> <StatusCard :status="notification.status!" :faded="true"> <template #meta> - <CommonMetaWrapper> + <div flex="~" gap-1 items-center> <div i-ri:repeat-fill text-xl mr-1 color-green /> <AccountInlineInfo text-primary font-bold :account="notification.account" mr1 /> - </CommonMetaWrapper> + </div> </template> </StatusCard> </template> <template v-else-if="notification.type === 'update'"> <StatusCard :status="notification.status!" :faded="true"> <template #meta> - <CommonMetaWrapper z-1> + <div flex="~" gap-1 items-center> <div i-ri:edit-2-fill text-xl mr-1 text-secondary /> <AccountInlineInfo :account="notification.account" mr1 /> <span ws-nowrap> {{ $t('notification.update_status') }} </span> - </CommonMetaWrapper> + </div> </template> </StatusCard> </template> diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue index 2d95727c..15d9d353 100644 --- a/components/status/StatusCard.vue +++ b/components/status/StatusCard.vue @@ -64,10 +64,10 @@ const showRebloggedByAvatarOnAvatar = rebloggedBy && avatarOnAvatar && reblogged <div v-if="filter?.filterAction !== 'hide'" :id="`status-${status.id}`" ref="el" relative flex flex-col gap-2 px-4 pt-3 pb-4 transition-100 :class="{ 'hover:bg-active': hover }" tabindex="0" focus:outline-none focus-visible:ring="2 primary" @click="onclick" @keydown.enter="onclick"> <div flex justify-between pb1> <slot name="meta"> - <CommonMetaWrapper v-if="rebloggedBy" text-secondary text-sm ws-nowrap> + <div v-if="rebloggedBy" text-secondary text-sm ws-nowrap flex="~" gap-1 items-center> <div i-ri:repeat-fill mr-1 text-primary /> <AccountInlineInfo font-bold :account="rebloggedBy" :avatar="!avatarOnAvatar" /> - </CommonMetaWrapper> + </div> <div v-else /> </slot> <StatusReplyingTo v-if="showReplyTo" :status="status" :class="faded ? 'text-secondary-light' : ''" />