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

Merge branch 'disjointed-popovers' into shigusegubu-vue3

Browse source 
* disjointed-popovers:
  make user popover options expert
  use same sizing for timeline dropdown as in the main nav
  fix avatar not zooming in profile page
This commit is contained in:
Henry Jameson 2022-07-27 21:31:38 +03:00
commit b053ba1222
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/settings_modal/tabs/general_tab.vue
View file

@ -75,12 +75,12 @@
</BooleanSetting> </BooleanSetting>
</li> </li>
<li> <li>
<BooleanSetting path="userPopoverZoom"> <BooleanSetting path="userPopoverZoom" expert="1">
{{ $t('settings.user_popover_avatar_zoom') }} {{ $t('settings.user_popover_avatar_zoom') }}
</BooleanSetting> </BooleanSetting>
</li> </li>
<li> <li>
<BooleanSetting path="userPopoverOverlay"> <BooleanSetting path="userPopoverOverlay" expert="1">
{{ $t('settings.user_popover_avatar_overlay') }} {{ $t('settings.user_popover_avatar_overlay') }}
</BooleanSetting> </BooleanSetting>
</li> </li>

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

@ -118,7 +118,9 @@
a { a {
display: block; display: block;
padding: 0.6em 0.65em; padding: 0 0.65em;
height: 3.5em;
line-height: 3.5em;
&:hover { &:hover {
background-color: $fallback--lightBg; background-color: $fallback--lightBg;

2
src/components/user_profile/user_profile.vue
View file

@ -8,7 +8,7 @@
:user-id="userId" :user-id="userId"
:switcher="true" :switcher="true"
:selected="timeline.viewing" :selected="timeline.viewing"
:avatar-action="zoom" avatar-action="zoom"
rounded="top" rounded="top"
/> />
<div <div