diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-07-31 17:57:32 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-07-31 17:57:32 +0000 |
| commit | 33ad712852088f8b99a82ec561733d41d63b0034 (patch) | |
| tree | 75eea24b29b4204b57e38aec8223e91a1f1526fe /src/components/settings_modal/tabs/general_tab.vue | |
| parent | 0b88c56aa674ad19be7e7e883a3687ec89569940 (diff) | |
| parent | 36aae1635ad370ecf4d22ae6d62cbbba6af19fd3 (diff) | |
Merge branch 'disjointed-popovers' into 'develop'
Disjointed popovers
See merge request pleroma/pleroma-fe!1540
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" |