aboutsummaryrefslogtreecommitdiff
path: root/src/components/user_popover/user_popover.vue
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2022-08-24 22:01:00 +0300
committerHenry Jameson <me@hjkos.com>2022-08-24 22:01:00 +0300
commit4e339d9be34400465e336a9c589ebaea705802d1 (patch)
treeda3d62a4dcfb38ac5b8289c4a4894561d9518f73 /src/components/user_popover/user_popover.vue
parente9ad922eeb3419185e30eaf99f11eadd0a7dee44 (diff)
parent86302128ba7c3f0389f66ebb235f51f29d45c454 (diff)
Merge remote-tracking branch 'origin/develop' into scrolltotop
* origin/develop: (47 commits) Update dependency eslint-plugin-vue to v9.4.0 Update dependency opn to v5 fix notices being under the navbar, also change offset to use variable fix modals not having proper z index reduce indexes to be below 9999 so that develop error messages appear above Fix react & extra buttons not styled on tab-focus Fix popover not popping up Fix styling on Safari Use :focus-visible instead of :focus for focus markers Optimize Reply badge position Add badges to status interacting buttons Update dependency nightwatch to v2 Update dependency eslint-plugin-n to v15.2.5 Update dependency mocha to v10 Update dependency karma-coverage to v2 Update dependency sass to v1.54.5 Update dependency karma-firefox-launcher to v2 Update dependency vue-template-compiler to v2.7.9 Pin dependencies Refresh yarn.lock ...
Diffstat (limited to 'src/components/user_popover/user_popover.vue')
-rw-r--r--src/components/user_popover/user_popover.vue2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/user_popover/user_popover.vue b/src/components/user_popover/user_popover.vue
index 4e999672..53d51fc4 100644
--- a/src/components/user_popover/user_popover.vue
+++ b/src/components/user_popover/user_popover.vue
@@ -14,7 +14,7 @@
class="user-popover"
:user-id="userId"
:hide-bio="true"
- :avatar-action="userPopoverZoom ? 'zoom' : close"
+ :avatar-action="userPopoverAvatarAction == 'close' ? close : userPopoverAvatarAction"
:on-close="close"
/>
</template>