]> cat aescling's git repositories - mastodon.git/commit
Make more apparent that an account is blocked or muted (fixes #6544) (#6627)
authorThibG <thib@sitedethib.com>
Mon, 5 Mar 2018 04:09:35 +0000 (05:09 +0100)
committerEugen Rochko <eugen@zeonfederated.com>
Mon, 5 Mar 2018 04:09:35 +0000 (05:09 +0100)
commit46a9a23749d58eb3ec415fef99da065ca69ea9fc
tree79b2a34e52673614db6af7c6f7a5e6a0dc2d7ee2
parent4e929b2d173fa22b722c58c0e9f8223eb4f44b0e
Make more apparent that an account is blocked or muted (fixes #6544) (#6627)

* Add button to unblock blocked accounts from their profile

* Add “Blocked” badge in place of “Follows you” when the user is blocked

* Add “Muted” badge (below “follows you” badge)
app/javascript/mastodon/features/account/components/header.js
app/javascript/mastodon/features/account_timeline/components/header.js
app/javascript/styles/mastodon/components.scss