diff --git a/.env.example b/.env.example index a0aebb6b..7f682ca8 100644 --- a/.env.example +++ b/.env.example @@ -1,5 +1,6 @@ NUXT_PUBLIC_TRANSLATE_API= NUXT_PUBLIC_DEFAULT_SERVER= +SINGLE_INSTANCE_SERVER= NUXT_PUBLIC_PRIVACY_POLICY_URL= # Production only diff --git a/README.md b/README.md index 7fb26c97..82bbf1e7 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,10 @@ These are known deployments using Elk as an alternative Web client for Mastodon - [elk.h4.io](https://elk.h4.io) - Use Elk for the `h4.io` Server - [elk.universeodon.com](https://elk.universeodon.com) - Use Elk for the Universeodon Server - [elk.vmst.io](https://elk.vmst.io) - Use Elk for the `vmst.io` Server +- [elk.hostux.social](https://elk.hostux.social) - Use Elk for the `hostux.social` Server +- [elk.freelancers.online](https://elk.freelancers.online) - Use Elk for the `freelancers.online` Server +- [elk.cupoftea.social](https://elk.cupoftea.social) - Use Elk for the `cupoftea.social` Server +- [elk.aus.social](https://elk.aus.social) - Use Elk for the `aus.social` Server > **Note**: Community deployments are **NOT** maintained by the Elk team. It may not be synced with Elk's source code. Please do your own research about the host servers before using them. diff --git a/components/account/AccountBotIndicator.vue b/components/account/AccountBotIndicator.vue index 721ca6f8..9dd3a93a 100644 --- a/components/account/AccountBotIndicator.vue +++ b/components/account/AccountBotIndicator.vue @@ -12,7 +12,7 @@ defineProps<{ > -
+
{{ $t('account.bot') }} diff --git a/components/account/AccountDisplayName.vue b/components/account/AccountDisplayName.vue index eb9a232a..9ffeec02 100644 --- a/components/account/AccountDisplayName.vue +++ b/components/account/AccountDisplayName.vue @@ -1,8 +1,9 @@ @@ -10,6 +11,7 @@ defineProps<{ diff --git a/components/account/AccountFollowButton.vue b/components/account/AccountFollowButton.vue index 7aab0fd9..600e2b95 100644 --- a/components/account/AccountFollowButton.vue +++ b/components/account/AccountFollowButton.vue @@ -117,7 +117,7 @@ const buttonStyle = $computed(() => { diff --git a/components/account/AccountHeader.vue b/components/account/AccountHeader.vue index 233c96d4..167ed2b6 100644 --- a/components/account/AccountHeader.vue +++ b/components/account/AccountHeader.vue @@ -91,56 +91,58 @@ const isNotifiedOnPost = $computed(() => !!relationship?.notifying)
-
- -
-
- - -
- +
+ + + {{ $t('settings.profile.appearance.title') }} + + + + + + + + + + + + + +
-
- - - - - - - - - - - - - - {{ $t('settings.profile.appearance.title') }} - +
+
+ + +
+
@@ -154,12 +156,12 @@ const isNotifiedOnPost = $computed(() => !!relationship?.notifying)
-
-
+
+
- +
diff --git a/components/account/AccountInlineInfo.vue b/components/account/AccountInlineInfo.vue index a24d160d..786080c5 100644 --- a/components/account/AccountInlineInfo.vue +++ b/components/account/AccountInlineInfo.vue @@ -6,6 +6,8 @@ const { link = true, avatar = true } = defineProps<{ link?: boolean avatar?: boolean }>() + +const userSettings = useUserSettings() diff --git a/components/command/CommandPanel.vue b/components/command/CommandPanel.vue index 03086dbe..1c955a15 100644 --- a/components/command/CommandPanel.vue +++ b/components/command/CommandPanel.vue @@ -64,6 +64,9 @@ const result = $computed(() => commandMode : searchResult, ) +const isMac = useIsMac() +const modifierKeyName = $computed(() => isMac.value ? '⌘' : 'Ctrl') + let active = $ref(0) watch($$(result), (n, o) => { if (n.length !== o.length || !n.items.every((i, idx) => i === o.items[idx])) @@ -233,8 +236,8 @@ const onKeyDown = (e: KeyboardEvent) => {
Tip: Use - to search, - to activate command mode. + to search, + to activate command mode.
diff --git a/components/publish/PublishErrMessage.vue b/components/common/CommonErrorMessage.vue similarity index 77% rename from components/publish/PublishErrMessage.vue rename to components/common/CommonErrorMessage.vue index e9ec814d..90ac77b6 100644 --- a/components/publish/PublishErrMessage.vue +++ b/components/common/CommonErrorMessage.vue @@ -1,22 +1,18 @@