diff options
| author | Sean King <seanking2919@protonmail.com> | 2022-08-01 18:17:09 -0600 |
|---|---|---|
| committer | Sean King <seanking2919@protonmail.com> | 2022-08-01 18:17:09 -0600 |
| commit | 081aa0fd0552732f208bd35e37cde06c66536791 (patch) | |
| tree | 053827cd9d9b258d6752195ab09eabd37d4c813b /src/components/settings_modal/tabs/general_tab.vue | |
| parent | 75216c5feb32b32e24952663ffa4233410585785 (diff) | |
| parent | 3fc9673a7d0fb851283e4ed687c2fd7790f03317 (diff) | |
Fix merge conflicts
Diffstat (limited to 'src/components/settings_modal/tabs/general_tab.vue')
| -rw-r--r-- | src/components/settings_modal/tabs/general_tab.vue | 36 |
1 files changed, 24 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..a2609200 100644 --- a/src/components/settings_modal/tabs/general_tab.vue +++ b/src/components/settings_modal/tabs/general_tab.vue @@ -75,6 +75,22 @@ </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 +277,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" |