logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: 399bd6f25c4f65061777b78db11dd022578c1b3a
parent: 56a0665b2f39185e56a469c78e4183aedca0403f
Author: lambda <pleromagit@rogerbraun.net>
Date:   Thu,  9 Nov 2017 10:01:54 +0000

Merge branch 'fix/dont-show-block-when-logged-out' into 'develop'

Check if logged-in when rendering the block button.

See merge request pleroma/pleroma-fe!145

Diffstat:

Msrc/components/user_card_content/user_card_content.vue4++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue @@ -46,7 +46,7 @@ </button> </span> </div> - <div class='block' v-if='isOtherUser'> + <div class='block' v-if='isOtherUser && loggedIn'> <span v-if='user.statusnet_blocking'> <button @click="unblockUser" class="base04 base00-background pressed"> {{ $t('user_card.blocked') }} @@ -150,7 +150,7 @@ <style lang="scss"> @import '../../_variables.scss'; - + .profile-panel-background { background-size: cover; border-radius: 10px;