From e0204e234bf30126f71d76746983d2ca62860436 Mon Sep 17 00:00:00 2001
From: Jesse Wierzbinski <contact@cpluspatch.com>
Date: Tue, 15 Apr 2025 23:31:50 +0200
Subject: [PATCH] fix: :bug: Fix various layout issues from previous update

---
 components/notes/attachment.vue               | 58 ++++++++++---------
 .../preferences/profile/image-uploader.vue    |  6 +-
 components/profiles/avatar.vue                |  2 +-
 components/profiles/profile-header.vue        |  3 +-
 components/profiles/profile.vue               |  6 +-
 nuxt.config.ts                                |  8 ++-
 6 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/components/notes/attachment.vue b/components/notes/attachment.vue
index 40a0b16..132d23c 100644
--- a/components/notes/attachment.vue
+++ b/components/notes/attachment.vue
@@ -1,6 +1,6 @@
 <template>
     <Dialog>
-        <Card class="w-full h-full overflow-hidden relative">
+        <Card class="w-full h-full overflow-hidden relative p-0">
             <DialogTrigger v-if="attachment.type === 'image'" :as-child="true">
                 <img :src="attachment.url" :alt="attachment.description ?? undefined"
                     class="w-full h-full object-contain bg-muted/20" />
@@ -30,36 +30,38 @@
             </Popover>
         </Card>
         <DialogContent :hide-close="true"
-            class="fixed inset-0 z-50 w-screen h-screen p-6 duration-200 bg-transparent border-none grid grid-rows-[auto_1fr_auto] overflow-hidden translate-x-0 translate-y-0 max-w-full !animate-none gap-6">
-            <div class="flex flex-row gap-2 w-full">
-                <DialogTitle class="sr-only">{{ attachment.type }}</DialogTitle>
-                <Button as="a" :href="attachment?.url" target="_blank" :download="true" variant="ghost" size="icon"
-                    class="[&_svg]:size-6  ml-auto">
-                    <Download />
-                </Button>
-                <DialogClose :as-child="true">
-                    <Button variant="ghost" size="icon" class="[&_svg]:size-6">
-                        <X />
+            class="p-6 duration-200 bg-transparent border-none overflow-hidden !animate-none gap-6 w-screen h-screen !max-w-none">
+            <div class="grid grid-rows-[auto_1fr_auto]">
+                <div class="flex flex-row gap-2 w-full">
+                    <DialogTitle class="sr-only">{{ attachment.type }}</DialogTitle>
+                    <Button as="a" :href="attachment?.url" target="_blank" :download="true" variant="ghost" size="icon"
+                        class="[&_svg]:size-6  ml-auto">
+                        <Download />
                     </Button>
-                </DialogClose>
-            </div>
-            <div class="flex items-center justify-center overflow-hidden *:max-h-[80vh] *:max-w-[80vw]">
-                <img v-if="attachment.type === 'image'" :src="attachment.url" :alt="attachment.description ?? ''"
-                    class="object-contain" />
-                <video v-else-if="attachment.type === 'video' || attachment.type === 'gifv'" :src="attachment.url"
-                    :alt="attachment.description ?? ''" class="object-cover" controls />
-                <audio v-else-if="attachment.type === 'audio'" :src="attachment.url" :alt="attachment.description ?? ''"
-                    class="object-cover" controls />
-                <div v-else class="flex flex-col items-center justify-center">
-                    <File class="size-12" />
-                    <span class="text-sm"></span>
+                    <DialogClose :as-child="true">
+                        <Button variant="ghost" size="icon" class="[&_svg]:size-6">
+                            <X />
+                        </Button>
+                    </DialogClose>
                 </div>
+                <div class="flex items-center justify-center overflow-hidden *:max-h-[80vh] *:max-w-[80vw]">
+                    <img v-if="attachment.type === 'image'" :src="attachment.url" :alt="attachment.description ?? ''"
+                        class="object-contain" />
+                    <video v-else-if="attachment.type === 'video' || attachment.type === 'gifv'" :src="attachment.url"
+                        :alt="attachment.description ?? ''" class="object-cover" controls />
+                    <audio v-else-if="attachment.type === 'audio'" :src="attachment.url"
+                        :alt="attachment.description ?? ''" class="object-cover" controls />
+                    <div v-else class="flex flex-col items-center justify-center">
+                        <File class="size-12" />
+                        <span class="text-sm"></span>
+                    </div>
+                </div>
+                <DialogDescription class="flex items-center justify-center">
+                    <Card v-if="attachment.description" class="p-4 max-w-md max-h-48 overflow-auto">
+                        <p class="text-sm">{{ attachment.description }}</p>
+                    </Card>
+                </DialogDescription>
             </div>
-            <DialogDescription class="flex items-center justify-center">
-                <Card v-if="attachment.description" class="p-4 max-w-md max-h-48 overflow-auto">
-                    <p class="text-sm">{{ attachment.description }}</p>
-                </Card>
-            </DialogDescription>
         </DialogContent>
     </Dialog>
 </template>
diff --git a/components/preferences/profile/image-uploader.vue b/components/preferences/profile/image-uploader.vue
index 227b6ba..3b76674 100644
--- a/components/preferences/profile/image-uploader.vue
+++ b/components/preferences/profile/image-uploader.vue
@@ -6,7 +6,7 @@
                 variant="ghost"
                 class="h-fit w-fit p-0 m-0 relative group border overflow-hidden"
             >
-                <Avatar size="lg" :src="image" :name="displayName" />
+                <Avatar class="size-32" :src="image" :name="displayName" />
                 <div
                     class="absolute inset-0 bg-background/80 flex group-hover:opacity-100 opacity-0 duration-200 items-center justify-center"
                 >
@@ -88,7 +88,7 @@
                                     <Label>{{
                                         m.witty_honest_wallaby_support()
                                     }}</Label>
-                                    <Avatar size="lg" :src="gravatarUrl" />
+                                    <Avatar class="size-32" :src="gravatarUrl" />
                                 </div>
                             </FormItem>
                         </FormField>
@@ -114,7 +114,7 @@
                                     <Label>{{
                                         m.witty_honest_wallaby_support()
                                     }}</Label>
-                                    <Avatar size="lg" :src="value" />
+                                    <Avatar class="size-32" :src="value" />
                                 </div>
                             </FormItem>
                         </FormField>
diff --git a/components/profiles/avatar.vue b/components/profiles/avatar.vue
index 39dd789..3ece60e 100644
--- a/components/profiles/avatar.vue
+++ b/components/profiles/avatar.vue
@@ -1,5 +1,5 @@
 <template>
-    <Avatar :class="shape.value === 'square' && 'rounded-md'">
+    <Avatar :class="[shape.value === 'square' && 'rounded-md', 'bg-secondary']">
         <AvatarFallback v-if="name">
             {{ getInitials(name) }}
         </AvatarFallback>
diff --git a/components/profiles/profile-header.vue b/components/profiles/profile-header.vue
index 4f24d4e..77674ed 100644
--- a/components/profiles/profile-header.vue
+++ b/components/profiles/profile-header.vue
@@ -16,8 +16,7 @@
             class="absolute bottom-0 translate-y-1/3 left-4 flex flex-row items-start gap-2"
         >
             <Avatar
-                size="lg"
-                class="border"
+                class="size-32 border"
                 :src="avatar"
                 :name="displayName"
             />
diff --git a/components/profiles/profile.vue b/components/profiles/profile.vue
index dd31da5..5505edc 100644
--- a/components/profiles/profile.vue
+++ b/components/profiles/profile.vue
@@ -30,7 +30,7 @@
                     </Button>
                 </ProfileActions>
             </div>
-            <div class="flex flex-col -mt-1 gap-2 justify-center">
+            <div class="flex flex-col -mt-1 gap-1 justify-center">
                 <CardTitle class="" v-render-emojis="account.emojis">
                     {{ account.display_name }}
                 </CardTitle>
@@ -45,10 +45,10 @@
                     >
                 </CopyableText>
             </div>
-            <ProfileBadges :account="account" />
+            <ProfileBadges :account="account" class="my-2" />
             <ProfileContent :content="account.note" :emojis="account.emojis" />
         </CardContent>
-        <CardFooter>
+        <CardFooter class="flex-col *:w-full gap-4">
             <ProfileStats
                 :creation-date="new Date(account.created_at || 0)"
                 :follower-count="account.followers_count"
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 678f030..e665ab7 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -33,7 +33,13 @@ export default defineNuxtConfig({
     },
     fonts: {
         families: [
-            { name: "Inter", provider: "local", weights: [400, 500, 600, 700, 800], styles: ["normal", "italic"], display: "swap" },
+            {
+                name: "Inter",
+                provider: "local",
+                weights: [400, 500, 600, 700, 800],
+                styles: ["normal", "italic"],
+                display: "swap",
+            },
         ],
     },
     pwa: {