hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into tusooa/stylelint

Browse source
This commit is contained in:
tusooa 2023-01-15 10:00:44 -05:00
commit d2ba67d565
No known key found for this signature in database
GPG key ID: 7B467EDE43A08224
19 changed files with 58 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/desktop_nav/desktop_nav.vue
View file

@ -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