diff options
| author | Weblate <noreply@weblate.org> | 2022-07-31 23:00:53 +0000 |
|---|---|---|
| committer | Weblate <noreply@weblate.org> | 2022-07-31 23:00:53 +0000 |
| commit | 71d9bbb56bf0927ce29e926e6e717c5ac8304f20 (patch) | |
| tree | 9093fda29c7b5f27cd74d38aba42f40ca0966daf /src/components/settings_modal/tabs/general_tab.vue | |
| parent | e0aeab04b8c1c296d2e16943f7333e05f5b2450b (diff) | |
| parent | 33ad712852088f8b99a82ec561733d41d63b0034 (diff) | |
Merge remote-tracking branch 'origin/develop' into develop
Diffstat (limited to 'src/components/settings_modal/tabs/general_tab.vue')
| -rw-r--r-- | src/components/settings_modal/tabs/general_tab.vue | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue index 1fe51b6d..e201ab9d 100644 --- a/src/components/settings_modal/tabs/general_tab.vue +++ b/src/components/settings_modal/tabs/general_tab.vue @@ -75,6 +75,16 @@ </BooleanSetting> </li> <li> + <BooleanSetting path="userPopoverZoom" expert="1"> + {{ $t('settings.user_popover_avatar_zoom') }} + </BooleanSetting> + </li> + <li> + <BooleanSetting path="userPopoverOverlay" expert="1"> + {{ $t('settings.user_popover_avatar_overlay') }} + </BooleanSetting> + </li> + <li> <ChoiceSetting v-if="user" id="thirdColumnMode" @@ -261,18 +271,14 @@ {{ $t('settings.mention_link_display') }} </ChoiceSetting> </li> - <ul - class="setting-list suboptions" - > - <li v-if="mentionLinkDisplay === 'short'"> - <BooleanSetting - path="mentionLinkShowTooltip" - expert="1" - > - {{ $t('settings.mention_link_show_tooltip') }} - </BooleanSetting> - </li> - </ul> + <li> + <BooleanSetting + path="mentionLinkShowTooltip" + expert="1" + > + {{ $t('settings.mention_link_use_tooltip') }} + </BooleanSetting> + </li> <li> <BooleanSetting path="useAtIcon" |