From 965b96c630c270ce5f2a4a08d17fe10fdaabfdc2 Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Tue, 13 Dec 2022 15:56:00 +0100
Subject: [PATCH] fix: status card styles (#415)

---
 components/common/CommonMetaWrapper.vue       |  2 +-
 components/conversation/ConversationCard.vue  | 17 ++++---
 components/notification/NotificationCard.vue  | 45 +++++++++++--------
 .../notification/NotificationGroupedLikes.vue | 21 +++++----
 components/status/StatusCard.vue              | 20 +++++----
 components/status/StatusReplyingTo.vue        |  2 +-
 6 files changed, 63 insertions(+), 44 deletions(-)

diff --git a/components/common/CommonMetaWrapper.vue b/components/common/CommonMetaWrapper.vue
index d7c8927b..378b50e3 100644
--- a/components/common/CommonMetaWrapper.vue
+++ b/components/common/CommonMetaWrapper.vue
@@ -1,5 +1,5 @@
 <template>
-  <div flex="~" gap-1 items-center absolute top-0 left-0 py-3 px-4>
+  <div flex="~" gap-1 items-center>
     <slot />
   </div>
 </template>
diff --git a/components/conversation/ConversationCard.vue b/components/conversation/ConversationCard.vue
index 15f9b4d4..ab94eb9b 100644
--- a/components/conversation/ConversationCard.vue
+++ b/components/conversation/ConversationCard.vue
@@ -12,12 +12,15 @@ const withAccounts = $computed(() =>
 
 <template>
   <article v-if="conversation.lastStatus" flex flex-col gap-2>
-    <div absolute flex gap-2 text-sm text-secondary font-bold left-3 px2 pt2>
-      <p mr-1>
-        {{ $t('conversation.with') }}
-      </p>
-      <AccountAvatar v-for="account in withAccounts" :key="account.id" h-5 w-5 :account="account" />
-    </div>
-    <StatusCard v-if="conversation.lastStatus" :decorated="true" :status="conversation.lastStatus" :actions="false" />
+    <StatusCard v-if="conversation.lastStatus" :status="conversation.lastStatus" :actions="false">
+      <template #meta>
+        <div flex gap-2 text-sm text-secondary font-bold>
+          <p mr-1>
+            {{ $t('conversation.with') }}
+          </p>
+          <AccountAvatar v-for="account in withAccounts" :key="account.id" h-5 w-5 :account="account" />
+        </div>
+      </template>
+    </StatusCard>
   </article>
 </template>
diff --git a/components/notification/NotificationCard.vue b/components/notification/NotificationCard.vue
index 8397bb26..1d7a0578 100644
--- a/components/notification/NotificationCard.vue
+++ b/components/notification/NotificationCard.vue
@@ -42,28 +42,37 @@ const { notification } = defineProps<{
       <AccountCard :account="notification.account" />
     </template>
     <template v-else-if="notification.type === 'favourite'">
-      <CommonMetaWrapper z-1>
-        <div i-ri:heart-fill text-xl mr-1 color-red />
-        <AccountInlineInfo text-primary font-bold :account="notification.account" mr1 />
-      </CommonMetaWrapper>
-      <StatusCard op50 hover:op100 :status="notification.status!" :decorated="true" />
+      <StatusCard :status="notification.status!" :faded="true">
+        <template #meta>
+          <CommonMetaWrapper>
+            <div i-ri:heart-fill text-xl mr-1 color-red />
+            <AccountInlineInfo text-primary font-bold :account="notification.account" mr1 />
+          </CommonMetaWrapper>
+        </template>
+      </StatusCard>
     </template>
     <template v-else-if="notification.type === 'reblog'">
-      <CommonMetaWrapper z-1>
-        <div i-ri:repeat-fill text-xl mr-1 color-green />
-        <AccountInlineInfo text-primary font-bold :account="notification.account" mr1 />
-      </CommonMetaWrapper>
-      <StatusCard op50 hover:op100 :status="notification.status!" :decorated="true" />
+      <StatusCard :status="notification.status!" :faded="true">
+        <template #meta>
+          <CommonMetaWrapper>
+            <div i-ri:repeat-fill text-xl mr-1 color-green />
+            <AccountInlineInfo text-primary font-bold :account="notification.account" mr1 />
+          </CommonMetaWrapper>
+        </template>
+      </StatusCard>
     </template>
     <template v-else-if="notification.type === 'update'">
-      <CommonMetaWrapper z-1>
-        <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>
-      <StatusCard :status="notification.status!" :decorated="true" />
+      <StatusCard :status="notification.status!" :faded="true">
+        <template #meta>
+          <CommonMetaWrapper z-1>
+            <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>
+        </template>
+      </StatusCard>
     </template>
     <template v-else-if="notification.type === 'mention' || notification.type === 'poll' || notification.type === 'status'">
       <StatusCard :status="notification.status!" />
diff --git a/components/notification/NotificationGroupedLikes.vue b/components/notification/NotificationGroupedLikes.vue
index 770eff32..819e4fb4 100644
--- a/components/notification/NotificationGroupedLikes.vue
+++ b/components/notification/NotificationGroupedLikes.vue
@@ -8,14 +8,17 @@ const { group } = defineProps<{
 
 <template>
   <article flex flex-col relative>
-    <div flex flex-col class="-mb-12" py-3>
-      <div v-for="like of group.likes" :key="like.account.id" flex px-3 py-1>
-        <div v-if="like.reblog" i-ri:repeat-fill text-xl mr-2 color-green />
-        <div v-if="like.favourite && !like.reblog" i-ri:heart-fill text-xl mr-2 color-red />
-        <AccountInlineInfo text-primary font-bold :account="like.account" mr2 />
-        <div v-if="like.favourite && like.reblog" i-ri:heart-fill text-xl mr-2 color-red />
-      </div>
-    </div>
-    <StatusCard op50 hover:op100 :status="group.status!" :decorated="true" />
+    <StatusCard :status="group.status!" :faded="true">
+      <template #meta>
+        <div flex flex-col gap-2>
+          <div v-for="like of group.likes" :key="like.account.id" flex>
+            <div v-if="like.reblog" i-ri:repeat-fill text-xl mr-2 color-green />
+            <div v-if="like.favourite && !like.reblog" i-ri:heart-fill text-xl mr-2 color-red />
+            <AccountInlineInfo text-primary font-bold :account="like.account" mr2 />
+            <div v-if="like.favourite && like.reblog" i-ri:heart-fill text-xl mr-2 color-red />
+          </div>
+        </div>
+      </template>
+    </StatusCard>
   </article>
 </template>
diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
index 804c3ec3..2d95727c 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -7,7 +7,7 @@ const props = withDefaults(
     actions?: boolean
     context?: FilterContext
     hover?: boolean
-    decorated?: boolean
+    faded?: boolean
     showReplyTo?: boolean
   }>(),
   { actions: true, showReplyTo: true },
@@ -62,13 +62,17 @@ const showRebloggedByAvatarOnAvatar = rebloggedBy && avatarOnAvatar && reblogged
 
 <template>
   <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">
-    <StatusReplyingTo v-if="showReplyTo" :status="status" />
-    <CommonMetaWrapper v-if="rebloggedBy" text-secondary text-sm ws-nowrap>
-      <div i-ri:repeat-fill mr-1 text-primary />
-      <AccountInlineInfo font-bold :account="rebloggedBy" :avatar="!avatarOnAvatar" />
-    </CommonMetaWrapper>
-    <div v-if="decorated || rebloggedBy || (showReplyTo && status.inReplyToAccountId)" h-6 />
-    <div flex gap-4>
+    <div flex justify-between pb1>
+      <slot name="meta">
+        <CommonMetaWrapper v-if="rebloggedBy" text-secondary text-sm ws-nowrap>
+          <div i-ri:repeat-fill mr-1 text-primary />
+          <AccountInlineInfo font-bold :account="rebloggedBy" :avatar="!avatarOnAvatar" />
+        </CommonMetaWrapper>
+        <div v-else />
+      </slot>
+      <StatusReplyingTo v-if="showReplyTo" :status="status" :class="faded ? 'text-secondary-light' : ''" />
+    </div>
+    <div flex gap-4 :class="faded ? 'text-secondary' : ''">
       <div relative>
         <AccountHoverWrapper :account="status.account" :class="showRebloggedByAvatarOnAvatar ? 'mt-4' : 'mt-1'">
           <NuxtLink :to="getAccountRoute(status.account)" rounded-full>
diff --git a/components/status/StatusReplyingTo.vue b/components/status/StatusReplyingTo.vue
index 517d8648..68d979bc 100644
--- a/components/status/StatusReplyingTo.vue
+++ b/components/status/StatusReplyingTo.vue
@@ -9,7 +9,7 @@ const account = useAccountById(status.inReplyToAccountId)
 </script>
 
 <template>
-  <div v-if="status.inReplyToAccountId" absolute top-0 right-0 px-4 py-3 flex="~ wrap" gap-1>
+  <div v-if="status.inReplyToAccountId" flex="~ wrap" gap-1>
     <NuxtLink
       v-if="status.inReplyToId"
       flex="~" items-center font-bold text-sm text-secondary gap-1