Skip to content

[pull] main from elk-zone:main #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Feb 26, 2026
Merged

[pull] main from elk-zone:main #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/components/publish/PublishWidget.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,17 +587,17 @@ const detectLanguage = useDebounceFn(async () => {
{{ $t('action.remove_quote') }}
</button>
</div>
<blockquote v-if="quotedStatus" b="~ base 1" rounded-lg overflow-hidden my-3>
<blockquote v-if="quotedStatus" border="~ base 1" rounded-lg overflow-hidden my-3>
<StatusCard
:status="quotedStatus"
:actions="false"
:is-nested="true"
/>
</blockquote>
<div v-else-if="quoteFetchError" text-danger b="base 1" rounded-lg hover:bg-active my-3 p-3>
<div v-else-if="quoteFetchError" text-danger border="base 1" rounded-lg hover:bg-active my-3 p-3>
{{ $t('error.quote_fetch_error') }} ({{ quoteFetchError }})
</div>
<StatusCardSkeleton v-else b="base 1" rounded-lg hover:bg-active my-3 />
<StatusCardSkeleton v-else border="base 1" rounded-lg hover:bg-active my-3 />
</template>

<!-- toolbar -->
Expand Down
22 changes: 11 additions & 11 deletions app/components/status/StatusQuote.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,43 +51,43 @@ const quotedStatus = computed(() => {
<template v-if="isNested && quoteState">
<div
v-if="quoteState === 'pending'"
flex b="~ 1" rounded-lg bg-card mt-3 p-3
flex border="~ 1" rounded-lg bg-card mt-3 p-3
>
Post pending for approval by author
</div>
<div
v-else-if="quoteState === 'revoked'"
flex b="~ 1" rounded-lg bg-card mt-3 p-3
flex border="~ 1" rounded-lg bg-card mt-3 p-3
>
Post removed by author
</div>
<div
v-else-if="quoteState === 'blocked_account'"
flex b="~ 1" rounded-lg bg-card mt-3 p-3
flex border="~ 1" rounded-lg bg-card mt-3 p-3
>
Post by blocked author
</div>
<div
v-else-if="quoteState === 'blocked_domain'"
flex b="~ 1" rounded-lg bg-card mt-3 p-3
flex border="~ 1" rounded-lg bg-card mt-3 p-3
>
Post from blocked server
</div>
<div
v-else-if="quoteState === 'muted_account'"
flex b="~ 1" rounded-lg bg-card mt-3 p-3
flex border="~ 1" rounded-lg bg-card mt-3 p-3
>
Post by muted author
</div>
<div
v-else-if="quoteState === 'deleted' || quoteState === 'rejected' || quoteState === 'unauthorized'"
flex b="~ 1" rounded-lg bg-card mt-3 p-3
flex border="~ 1" rounded-lg bg-card mt-3 p-3
>
Post is unavailable
</div>
<div
v-else-if="quoteState === 'accepted'"
flex b="~ 1" rounded-lg bg-card mt-3 p-3
flex border="~ 1" rounded-lg bg-card mt-3 p-3
>
Post by
<AccountInlineInfo :account="quotedStatus.account" :link="false" mx-1 />
Expand All @@ -96,19 +96,19 @@ const quotedStatus = computed(() => {
<template v-else>
<div
v-if="quoteState === 'pending'"
flex b="~ 1" rounded-lg bg-card mt-3 p-3
flex border="~ 1" rounded-lg bg-card mt-3 p-3
>
Post pending for approval by author
</div>
<div
v-else-if="quoteState === 'revoked'"
flex b="~ 1" rounded-lg bg-card mt-3 p-3
flex border="~ 1" rounded-lg bg-card mt-3 p-3
>
Post removed by author
</div>
<div
v-else-if="quoteState === 'deleted' || quoteState === 'rejected' || quoteState === 'unauthorized'"
flex b="~ 1" rounded-lg bg-card mt-3 p-3
flex border="~ 1" rounded-lg bg-card mt-3 p-3
>
Post is unavailable
</div>
Expand All @@ -120,7 +120,7 @@ const quotedStatus = computed(() => {
:status="quotedStatus"
:actions="false"
:is-nested="true"
b="base 1" rounded-lg hover:bg-active my-3
border="base 1" rounded-lg hover:bg-active my-3
/>
</blockquote>
</template>
Expand Down
Loading