From a8e23422405221e4bacf46ce3f675a1f665bcf61 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator <kainoa@t1c.dev> Date: Tue, 16 Aug 2022 00:22:37 -0700 Subject: [PATCH] feat: :sparkles: Make mobile account avatar clickable --- package.json | 2 +- .../client/src/components/global/page-header.vue | 12 ++++++++++-- packages/client/src/ui/universal.vue | 5 ----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 3aa704aa6..70c24b56f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "12.118.1-calc.10", + "version": "12.118.1-calc.11", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/global/page-header.vue b/packages/client/src/components/global/page-header.vue index c5aff22db..14aaf45e5 100644 --- a/packages/client/src/components/global/page-header.vue +++ b/packages/client/src/components/global/page-header.vue @@ -1,7 +1,9 @@ <template> <div v-if="show" ref="el" class="fdidabkb" :class="{ slim: narrow, thin: thin_ }" :style="{ background: bg }" @click="onClick"> <div v-if="narrow" class="buttons left"> - <MkAvatar v-if="props.displayMyAvatar && $i" class="avatar" :user="$i" :disable-preview="true"/> + <button v-click-anime v-tooltip.noDelay.right="`${i18n.ts.account}: @${$i.username}`" class="item _button account" @click="openAccountMenu"> + <MkAvatar v-if="props.displayMyAvatar && $i" class="avatar" :user="$i" :disable-preview="true"/> + </button> </div> <template v-if="metadata"> <div v-if="!hideTitle" class="titleContainer" @click="showTabsPopup"> @@ -44,7 +46,7 @@ import { scrollToTop } from '@/scripts/scroll'; import { i18n } from '@/i18n'; import { globalEvents } from '@/events'; import { injectPageMetadata } from '@/scripts/page-metadata'; -import { $i } from '@/account'; +import { $i, openAccountMenu as openAccountMenu_ } from '@/account'; type Tab = { key?: string | null; @@ -87,6 +89,12 @@ const show = $computed(() => { return !hideTitle || hasTabs || hasActions; }); +const openAccountMenu = (ev: MouseEvent) => { + openAccountMenu_({ + withExtraOperation: true, + }, ev); +}; + const showTabsPopup = (ev: MouseEvent) => { if (!hasTabs) return; if (!narrow) return; diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue index e1b46ecae..2d80907c4 100644 --- a/packages/client/src/ui/universal.vue +++ b/packages/client/src/ui/universal.vue @@ -325,11 +325,6 @@ const wallpaper = localStorage.getItem('wallpaper') != null; margin-right: 8px; } } - - /* &:hover { - background: var(--X2); - } */ - > .indicator { position: absolute; top: 0;