aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHJ <30-hj@users.noreply.git.pleroma.social>2023-01-09 21:11:09 +0000
committerHJ <30-hj@users.noreply.git.pleroma.social>2023-01-09 21:11:09 +0000
commit06068afe9135bb25fb5f6426b6d6d3c5b9ccc815 (patch)
tree87145871d4a2df168982200788d26322de4c375f /src
parent9b762a1c69e344e212705b7e4c8ecda7493d09ec (diff)
parent6d0b3d4d0a579b0669b93dc68c143d5755bf157a (diff)
Merge branch 'tusooa/1232-scroll-to-top' into 'develop'
Stop propogation for all top-bar buttons Closes #1232 See merge request pleroma/pleroma-fe!1748
Diffstat (limited to 'src')
-rw-r--r--src/components/desktop_nav/desktop_nav.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index 5db7fc79..07bf8005 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -38,7 +38,7 @@
/>
<button
class="button-unstyled nav-icon"
- @click="openSettingsModal"
+ @click.stop="openSettingsModal"
>
<FAIcon
fixed-width
@@ -65,7 +65,7 @@
<button
v-if="currentUser"
class="button-unstyled nav-icon"
- @click.prevent="logout"
+ @click.stop.prevent="logout"
>
<FAIcon
fixed-width