chore: merge upsream

BDX-town · Jan 24, 2025 · b20e7fd · b20e7fd
2 parents 63f7549 + 39b2182
commit b20e7fd
Show file tree

Hide file tree

Showing 5 changed files with 127 additions and 70 deletions.
diff --git a/elk/components/status/StatusPreviewCardMoreFromAuthor.vue b/elk/components/status/StatusPreviewCardMoreFromAuthor.vue
@@ -11,7 +11,8 @@ defineProps<{
     max-h-2xl
     flex gap-2
     my-auto
-    bg-gray-300
+    p-4 py-2
+    light:bg-gray-3 dark:bg-gray-8
   >
     <span z-0>More from</span>
     <AccountInlineInfo :account="account" hover:bg-gray-300 />

diff --git a/elk/components/status/StatusPreviewCardNormal.vue b/elk/components/status/StatusPreviewCardNormal.vue
@@ -45,69 +45,72 @@ function loadAttachment() {
     bg-card
     hover:bg-active
     :class="{
-      'flex': isSquare,
+      'flex flex-col': isSquare,
       'p-4': root,
       'rounded-lg': !root,
     }"
     target="_blank"
     external
   >
-    <div
-      v-if="card.image"
-      flex flex-col
-      display-block of-hidden
-      :class="{
-        'sm:(min-w-32 w-32 h-32) min-w-24 w-24 h-24': isSquare,
-        'w-full aspect-[1.91]': !isSquare,
-        'rounded-lg': root,
-      }"
-      relative
-    >
-      <CommonBlurhash
-        :blurhash="card.blurhash"
-        :src="card.image"
-        :width="card.width"
-        :height="card.height"
-        :alt="alt"
-        :should-load-image="shouldLoadAttachment"
-        w-full h-full object-cover
-        :class="!shouldLoadAttachment ? 'brightness-60' : ''"
-      />
-      <button
-        v-if="!shouldLoadAttachment"
-        type="button"
-        absolute
-        class="status-preview-card-load bg-black/64"
-        p-2
-        transition
-        rounded
-        hover:bg-black
-        cursor-pointer
-        @click.stop.prevent="!shouldLoadAttachment ? loadAttachment() : null"
+    <div :class="isSquare ? 'flex' : ''">
+      <!-- image -->
+      <div
+        v-if="card.image"
+        flex flex-col
+        display-block of-hidden
+        :class="{
+          'sm:(min-w-32 w-32 h-32) min-w-24 w-24 h-24': isSquare,
+          'w-full aspect-[1.91]': !isSquare,
+          'rounded-lg': root,
+        }"
+        relative
       >
-        <span
-          text-sm
-          text-white
-          flex flex-col justify-center items-center
-          gap-3 w-6 h-6
-          i-ri:file-download-line
+        <CommonBlurhash
+          :blurhash="card.blurhash"
+          :src="card.image"
+          :width="card.width"
+          :height="card.height"
+          :alt="alt"
+          :should-load-image="shouldLoadAttachment"
+          w-full h-full object-cover
+          :class="!shouldLoadAttachment ? 'brightness-60' : ''"
         />
-      </button>
-    </div>
-    <div
-      v-else
-      min-w-24 w-24 h-24 sm="min-w-32 w-32 h-32" bg="slate-500/10" flex justify-center items-center
-      :class="[
-        root ? 'rounded-lg' : '',
-      ]"
-    >
-      <div :class="cardTypeIconMap[card.type]" w="30%" h="30%" text-secondary />
+        <button
+          v-if="!shouldLoadAttachment"
+          type="button"
+          absolute
+          class="status-preview-card-load bg-black/64"
+          p-2
+          transition
+          rounded
+          hover:bg-black
+          cursor-pointer
+          @click.stop.prevent="!shouldLoadAttachment ? loadAttachment() : null"
+        >
+          <span
+            text-sm
+            text-white
+            flex flex-col justify-center items-center
+            gap-3 w-6 h-6
+            i-ri:file-download-line
+          />
+        </button>
+      </div>
+      <div
+        v-else
+        min-w-24 w-24 h-24 sm="min-w-32 w-32 h-32" bg="slate-500/10" flex justify-center items-center
+        :class="[
+          root ? 'rounded-lg' : '',
+        ]"
+      >
+        <div :class="cardTypeIconMap[card.type]" w="30%" h="30%" text-secondary />
+      </div>
+      <!-- description -->
+      <StatusPreviewCardInfo :p="isSquare ? 'x-4' : '4'" :root="root" :card="card" :provider="providerName" />
     </div>
-    <StatusPreviewCardInfo :p="isSquare ? 'x-4' : '4'" :root="root" :card="card" :provider="providerName" />
     <StatusPreviewCardMoreFromAuthor
       v-if="card?.authors?.[0].account"
       :account="card.authors[0].account"
-      p-4 py-2
     />
   </NuxtLink>
 </template>

diff --git a/elk/docs/package.json b/elk/docs/package.json
@@ -13,6 +13,6 @@
   },
   "devDependencies": {
     "@nuxt-themes/docus": "^1.15.1",
-    "nuxt": "^3.15.1"
+    "nuxt": "^3.15.2"
   }
 }
diff --git a/elk/locales/ca-valencia.json b/elk/locales/ca-valencia.json
@@ -108,8 +108,8 @@
       "desc3": "No inicies sessió amb el teu compte real."
     },
     "desc_highlight": "Espereu trobar alguns errors i que falten funcions ací i allà.",
-    "desc_para1": "Gràcies pel teu interès en provar Elk, el nostre client web Mastodon en procés",
-    "desc_para2": "estem treballant de valent en el desenvolupament i en millorar-lo.",
+    "desc_para1": "Gràcies pel teu interès en provar Elk, el nostre client web Mastodon en proves!",
+    "desc_para2": "Estem treballant de valent en el desenvolupament i en millorar-lo.",
     "desc_para3": "Per a impulsar el desenvolupament, pots patrocinar l'equip a través dels patrocis de GitHub. Esperem que gaudisques d'Elk!",
     "desc_para4": "Elk és de codi obert. Si vols ajudar amb proves, comentaris o contribucions,",
     "desc_para5": "troba'ns a GitHub",
@@ -275,7 +275,7 @@
       "hide_alt_indi_on_posts": "Amaga l'indicador «alt» a les publicacions",
       "hide_boost_count": "Amaga el nombre d'impulsos",
       "hide_react_count": "Amaga el nombre de preferits",
-      "hide_follower_count": "Amaga el nombre seguidors",
+      "hide_follower_count": "Amaga el nombre de seguidors",
       "hide_reply_count": "Amaga el nombre de respostes",
       "hide_username_emojis": "Amaga els emojis dels noms d'usuari",
       "label": "Configuració",
@@ -352,16 +352,16 @@
     "second_future": "ara|en {n} segon|en {n} segons",
     "second_past": "ara|fa {n} segon|fa {n} segons",
     "short_day_future": "en {n} d",
-    "short_day_past": "{n} d",
+    "short_day_past": "fa {n} d",
     "short_hour_future": "en {n} h",
-    "short_hour_past": "{n} h",
+    "short_hour_past": "fa {n} h",
     "short_minute_future": "en {n} min",
-    "short_minute_past": "{n} min",
+    "short_minute_past": "fa {n} min",
     "short_month_future": "en {n} mes",
-    "short_month_past": "{n} mes",
-    "short_week_past": "{n}w",
+    "short_month_past": "fa {n} mes",
+    "short_week_past": "fa {n} set",
     "short_year_future": "en {n} a",
-    "short_year_past": "{n} a",
+    "short_year_past": "fa {n} a",
     "week_future": "en 0 setmanes|la setmana que ve|en {n} setmanes",
     "year_future": "en 0 anys|l'any que ve|en {n} anys"
   },