Skip to content

Commit f90a439

Browse files
committed
fix: 🐛 Layout fixes, make CW composing work
1 parent a41aa3b commit f90a439

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

components/avatars/Centered.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div v-bind="$props" class="bg-dark-700 overflow-hidden flex items-center justify-center">
3-
<Skeleton :enabled="!url" class="!h-full !w-full">
4-
<img class="cursor-pointer bg-dark-700 ring-1 w-full h-full object-cover" :src="url" :alt="alt"
3+
<Skeleton :enabled="!src" class="!h-full !w-full">
4+
<img class="cursor-pointer bg-dark-700 ring-1 w-full h-full object-cover" :src="src" :alt="alt"
55
:title="alt" />
66
</Skeleton>
77
</div>
@@ -11,7 +11,7 @@
1111
import type { HTMLAttributes } from "vue";
1212
1313
interface Props extends /* @vue-ignore */ HTMLAttributes {
14-
url?: string;
14+
src?: string;
1515
alt?: string;
1616
}
1717

components/composer/composer.vue

+4-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</div>
2626
<!-- Content warning textbox -->
2727
<div v-if="cw !== null" class="mb-4">
28-
<input type="text" placeholder="Add a content warning"
28+
<input type="text" v-model="cwContent" placeholder="Add a content warning"
2929
class="w-full p-2 mt-1 text-sm prose prose-invert bg-dark-900 rounded focus:!ring-0 !ring-none !border-none !outline-none placeholder:text-zinc-500 appearance-none focus:!border-none focus:!outline-none" />
3030
</div>
3131
<div class="flex flex-row gap-1 border-white/20">
@@ -69,6 +69,7 @@ const respondingTo = ref<Status | null>(null);
6969
const respondingType = ref<"reply" | "quote" | null>(null);
7070
const me = useMe();
7171
const cw = ref(null as string | null);
72+
const cwContent = ref("");
7273
const markdown = ref(true);
7374
7475
const splashes = useConfig().COMPOSER_SPLASHES;
@@ -129,6 +130,8 @@ const send = async () => {
129130
respondingType.value === "quote"
130131
? respondingTo.value?.id
131132
: null,
133+
spoiler_text: cw ? cwContent.value.trim() : undefined,
134+
sensitive: !!cw,
132135
}),
133136
})
134137
.then(async (res) => {

components/headers/greeting.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div v-if="me" class="bg-dark-800 p-6 my-5 rounded ring-1 ring-white/5">
44
<div class="sm:flex sm:items-center sm:justify-between">
55
<div class="sm:flex sm:space-x-5">
6-
<AvatarsCentered :url="me.avatar"
6+
<AvatarsCentered :src="me.avatar"
77
class="mx-auto shrink-0 size-20 rounded overflow-hidden ring-1 ring-white/10" />
88
<div class="mt-4 text-center sm:mt-0 sm:pt-1 sm:text-left">
99
<p class="text-sm font-medium text-gray-300">Welcome back,</p>

components/social-elements/notes/header.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div v-if="small" class="flex flex-row">
33
<NuxtLink :href="accountUrl" class="shrink-0">
4-
<AvatarsCentered :url="note?.account.avatar" :alt="`${note?.account.acct}'s avatar`"
4+
<AvatarsCentered :src="note?.account.avatar" :alt="`${note?.account.acct}'s avatar`"
55
class="size-6 rounded ring-1 ring-white/5" />
66
</NuxtLink>
77
<div class="flex flex-col items-start justify-around ml-4 grow overflow-hidden">
@@ -22,7 +22,7 @@
2222
</div>
2323
<div v-else class="flex flex-row">
2424
<NuxtLink :href="accountUrl" class="shrink-0">
25-
<AvatarsCentered :url="note?.account.avatar" :alt="`${note?.account.acct}'s avatar`"
25+
<AvatarsCentered :src="note?.account.avatar" :alt="`${note?.account.acct}'s avatar`"
2626
class="h-12 w-12 rounded ring-1 ring-white/5" />
2727
</NuxtLink>
2828
<div class="flex flex-col items-start justify-around ml-4 grow overflow-hidden">

components/social-elements/notes/reply-header.vue

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
<template>
2-
<NuxtLink :href="`/@${account?.acct}`"
3-
class="mb-4 flex flex-row gap-2 items-center text-gray-300 opacity-70 line-clamp-1">
2+
<NuxtLink :href="`/@${account?.acct}`" class="mb-4 flex flex-row gap-2 items-center text-gray-300 opacity-70">
43
<Skeleton :enabled="!account" shape="rect" class="!h-6" :min-width="40" :max-width="100" width-unit="%">
54
<iconify-icon icon="tabler:arrow-back-up" width="1.5rem" height="1.5rem" aria-hidden="true" />
6-
<span class="flex flex-row items-center gap-2 overflow-hidden flex-wrap break-all">
7-
Replying to
8-
<AvatarsCentered v-if="account?.avatar" :url="account?.avatar" :alt="`${account?.acct}'s avatar'`"
9-
class="size-5 rounded inline-flex shrink-0 ring-1 ring-white/10" />
10-
<strong class="line-clamp-1">{{ account?.display_name || account?.acct }}</strong>
11-
</span>
5+
<span class="shrink-0">Replying to</span>
6+
<AvatarsCentered v-if="account?.avatar" :src="account?.avatar" :alt="`${account?.acct}'s avatar'`"
7+
class="size-5 shrink-0 rounded ring-1 ring-white/10" />
8+
<strong class="line-clamp-1">{{ account?.display_name || account?.acct }}</strong>
129
</Skeleton>
1310
</NuxtLink>
1411
</template>

components/social-elements/users/Account.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<template>
22
<ClientOnly>
33
<div class="w-full ring-1 ring-inset ring-white/5 pb-10">
4-
<AvatarsCentered :url="account?.header" :alt="`${account?.acct}'s header image'`"
4+
<AvatarsCentered :src="account?.header" :alt="`${account?.acct}'s header image'`"
55
class="w-full aspect-[8/3] border-b border-white/10 bg-dark-700" />
66

77
<div class="flex items-start justify-between px-4 py-3">
8-
<AvatarsCentered :url="account?.avatar" :alt="`${account?.acct}'s avatar'`"
8+
<AvatarsCentered :src="account?.avatar" :alt="`${account?.acct}'s avatar'`"
99
class="h-32 w-32 -mt-[4.5rem] z-10 shrink-0 rounded ring-2 ring-dark-800" />
1010

1111
<ClientOnly>

0 commit comments

Comments
 (0)