diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-08-22 22:34:38 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-08-22 22:34:38 +0000 |
| commit | 91422367d35372bd5977a5c091c80647e2628f6e (patch) | |
| tree | e0d102a21b4a62aab390617b2b217341cb969e3d /src/components/settings_modal/tabs/general_tab.vue | |
| parent | 88a3cf8705f925c31b5fad67d0fb709a51447156 (diff) | |
| parent | 272b748f26d0bb7b9f3a00336a908d507f4169bc (diff) | |
Merge branch 'allow-opening-profile-in-user-popover' into 'develop'
Allow opening profile in user popover when clicking on avatar
See merge request pleroma/pleroma-fe!1586
Diffstat (limited to 'src/components/settings_modal/tabs/general_tab.vue')
| -rw-r--r-- | src/components/settings_modal/tabs/general_tab.vue | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue index 333b5493..50e2bc44 100644 --- a/src/components/settings_modal/tabs/general_tab.vue +++ b/src/components/settings_modal/tabs/general_tab.vue @@ -60,12 +60,14 @@ </BooleanSetting> </li> <li> - <BooleanSetting - path="userPopoverZoom" + <ChoiceSetting + id="userPopoverAvatarAction" + path="userPopoverAvatarAction" + :options="userPopoverAvatarActionOptions" expert="1" > - {{ $t('settings.user_popover_avatar_zoom') }} - </BooleanSetting> + {{ $t('settings.user_popover_avatar_action') }} + </ChoiceSetting> </li> <li> <BooleanSetting |