mirrors/elk
1
0
Fork 0
mirror of https://github.com/elk-zone/elk.git synced 2024-12-13 14:49:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: resolve conflicts

Browse source
This commit is contained in:
三咲智子 2023-01-04 22:15:24 +08:00
parent 66295199b4
commit 53dcd8b28f
No known key found for this signature in database
GPG key ID: 69992F2250DFD93E
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/user/UserDropdown.vue
View file

@ -3,7 +3,7 @@
<button btn-action-icon :aria-label="$t('action.switch_account')"> <button btn-action-icon :aria-label="$t('action.switch_account')">
<!-- TODO --> <!-- TODO -->
<div :class="{ 'hidden xl:block': !isGuest }" i-ri:more-2-line /> <div :class="{ 'hidden xl:block': !isGuest }" i-ri:more-2-line />
<AccountAvatar v-if="!isGuest" xl:hidden :account="account" w-9 h-9 /> <AccountAvatar v-if="!isGuest" xl:hidden :account="currentUser.account" w-9 h-9 />
<span v-else>TODO: Guest</span> <span v-else>TODO: Guest</span>
</button> </button>
<template #popper="{ hide }"> <template #popper="{ hide }">