diff --git a/components/account/AccountFollowButton.vue b/components/account/AccountFollowButton.vue index 28781266..d64653e6 100644 --- a/components/account/AccountFollowButton.vue +++ b/components/account/AccountFollowButton.vue @@ -85,7 +85,7 @@ const buttonStyle = $computed(() => { gap-1 items-center group :disabled="relationship?.requested" border-1 - rounded-full flex="~ gap2 center" font-500 w-30 h-fit py1 + rounded-full flex="~ gap2 center" font-500 min-w-30 h-fit px3 py1 :class="buttonStyle" :hover="!relationship?.blocking && !relationship?.muting && relationship?.following ? 'border-red text-red' : 'bg-base border-primary text-primary'" @click="relationship?.blocking ? unblock() : relationship?.muting ? unmute() : toggleFollow()" diff --git a/components/account/AccountHeader.vue b/components/account/AccountHeader.vue index dbd4cb54..031c2573 100644 --- a/components/account/AccountHeader.vue +++ b/components/account/AccountHeader.vue @@ -88,7 +88,7 @@ const isSelf = $computed(() => currentUser.value?.account.id === account.id) {{ $t('settings.profile.appearance.title') }} diff --git a/components/modal/ModalContainer.vue b/components/modal/ModalContainer.vue index 6f2be889..25ba1d62 100644 --- a/components/modal/ModalContainer.vue +++ b/components/modal/ModalContainer.vue @@ -5,6 +5,7 @@ import { isCommandPanelOpen, isConfirmDialogOpen, isEditHistoryDialogOpen, + isFavouritedBoostedByDialogOpen, isMediaPreviewOpen, isPreviewHelpOpen, isPublishDialogOpen, @@ -20,11 +21,11 @@ const isMac = useIsMac() // listen to ctrl+/ on windows/linux or cmd+/ on mac // or shift+ctrl+k on windows/linux or shift+cmd+k on mac useEventListener('keydown', (e: KeyboardEvent) => { - if (e.key === 'k' && (isMac.value ? e.metaKey : e.ctrlKey)) { + if ((e.key === 'k' || e.key === 'л') && (isMac.value ? e.metaKey : e.ctrlKey)) { e.preventDefault() openCommandPanel(e.shiftKey) } - if (e.key === '/' && (isMac.value ? e.metaKey : e.ctrlKey)) { + if ((e.key === '/' || e.key === ',') && (isMac.value ? e.metaKey : e.ctrlKey)) { e.preventDefault() openCommandPanel(true) } @@ -43,6 +44,10 @@ const handleConfirmChoice = (choice: ConfirmDialogChoice) => { confirmDialogChoice.value = choice isConfirmDialogOpen.value = false } + +const handleFavouritedBoostedByClose = () => { + isFavouritedBoostedByDialogOpen.value = false +} diff --git a/components/notification/NotificationPaginator.vue b/components/notification/NotificationPaginator.vue index d5b9266a..7764513e 100644 --- a/components/notification/NotificationPaginator.vue +++ b/components/notification/NotificationPaginator.vue @@ -3,10 +3,10 @@ import { mastodon } from 'masto' import type { Paginator, WsEvents } from 'masto' // type used in