1
0
Fork 1
mirror of https://github.com/elk-zone/elk.git synced 2024-11-20 07:49:57 +00:00

feat: direct messages bubbles (#262)

This commit is contained in:
patak 2022-12-01 08:32:07 +01:00 committed by GitHub
parent 12bb0bbb2d
commit a28f14cb70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 14 deletions

View file

@ -81,7 +81,7 @@ const timeago = useTimeAgo(() => status.createdAt, timeAgoOptions)
<StatusActionsMore :status="status" mr--2 /> <StatusActionsMore :status="status" mr--2 />
</div> </div>
<StatusReplyingTo v-if="status.inReplyToAccountId" :status="status" pt1 /> <StatusReplyingTo v-if="status.inReplyToAccountId" :status="status" pt1 />
<div> <div :class="status.visibility === 'direct' ? 'my3 p2 px5 br2 bg-fade rounded-3 rounded-tl-none' : ''">
<StatusSpoiler :enabled="status.sensitive"> <StatusSpoiler :enabled="status.sensitive">
<template #spoiler> <template #spoiler>
<p>{{ status.spoilerText }}</p> <p>{{ status.spoilerText }}</p>

View file

@ -26,6 +26,9 @@ const visibility = $computed(() => STATUS_VISIBILITIES.find(v => v.value === sta
</AccountHoverWrapper> </AccountHoverWrapper>
</NuxtLink> </NuxtLink>
<StatusReplyingTo v-if="status.inReplyToAccountId" :status="status" /> <StatusReplyingTo v-if="status.inReplyToAccountId" :status="status" />
<div
:class="status.visibility === 'direct' ? 'my3 p2 px5 br2 bg-fade rounded-3 rounded-tl-none' : ''"
>
<StatusSpoiler :enabled="status.sensitive"> <StatusSpoiler :enabled="status.sensitive">
<template #spoiler> <template #spoiler>
<p text-2xl> <p text-2xl>
@ -39,6 +42,7 @@ const visibility = $computed(() => STATUS_VISIBILITIES.find(v => v.value === sta
:status="status" :status="status"
/> />
</StatusSpoiler> </StatusSpoiler>
</div>
<div flex="~ gap-1" items-center text-secondary text-sm> <div flex="~ gap-1" items-center text-secondary text-sm>
<div flex> <div flex>
<div>{{ createdAt }}</div> <div>{{ createdAt }}</div>

View file

@ -7,6 +7,7 @@
--c-bg-active: #f6f6f6; --c-bg-active: #f6f6f6;
--c-bg-code: #00000006; --c-bg-code: #00000006;
--c-bg-selection: #8885; --c-bg-selection: #8885;
--c-bg-fade: #EA9E4422;
--c-text-base: #232323; --c-text-base: #232323;
--c-text-code: #7ca72f; --c-text-code: #7ca72f;
@ -24,6 +25,7 @@
--c-bg-base: #111; --c-bg-base: #111;
--c-bg-active: #191919; --c-bg-active: #191919;
--c-bg-code: #ffffff06; --c-bg-code: #ffffff06;
--c-bg-fade: #EA9E4422;
--c-text-base: #fff; --c-text-base: #fff;
--c-text-code: #90be3d; --c-text-code: #90be3d;

View file

@ -19,6 +19,7 @@ export default defineConfig({
'bg-base': 'bg-$c-bg-base', 'bg-base': 'bg-$c-bg-base',
'bg-active': 'bg-$c-bg-active', 'bg-active': 'bg-$c-bg-active',
'bg-code': 'bg-$c-bg-code', 'bg-code': 'bg-$c-bg-code',
'bg-fade': 'bg-$c-bg-fade',
// text colors // text colors
'text-base': 'text-$c-text-base', 'text-base': 'text-$c-text-base',