Merge branch 'main' into userquin/fix-settings-navigation

elk-zone · Jan 22, 2023 · 3357b63 · 3357b63
2 parents 0dd462a + c28c95e
commit 3357b63
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
@@ -164,7 +164,7 @@ const showReplyTo = $computed(() => !replyToMain && !directReply)
             <StatusAccountDetails :account="status.account" />
           </AccountHoverWrapper>
           <div flex-auto />
-          <div v-show="!userSettings.zenMode" text-sm text-secondary flex="~ row nowrap" hover:underline>
+          <div v-show="!userSettings.zenMode" text-sm text-secondary flex="~ row nowrap" hover:underline whitespace-nowrap>
             <AccountBotIndicator v-if="status.account.bot" me-2 />
             <div flex="~ gap1" items-center>
               <StatusVisibilityIndicator v-if="status.visibility !== 'public'" :status="status" />

diff --git a/components/tag/TagCard.vue b/components/tag/TagCard.vue
@@ -7,7 +7,10 @@ const {
   tag: mastodon.v1.Tag
 }>()
 
-const to = $computed(() => new URL(tag.url).pathname)
+const to = $computed(() => {
+  const { hostname, pathname } = new URL(tag.url)
+  return `/${hostname}${pathname}`
+})
 </script>
 
 <template>