From fca183968e4a868c8930ba3ac8fe22cef0c07f54 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 24 Nov 2016 23:09:53 +0100 Subject: [PATCH] Center header in account column, hide media in "muted" status components (notifications) --- app/assets/javascripts/components/components/status.jsx | 2 +- .../components/features/account/components/header.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/components/components/status.jsx b/app/assets/javascripts/components/components/status.jsx index 603561ab38..df5f0f2c24 100644 --- a/app/assets/javascripts/components/components/status.jsx +++ b/app/assets/javascripts/components/components/status.jsx @@ -82,7 +82,7 @@ const Status = React.createClass({ ); } - if (status.get('media_attachments').size > 0) { + if (status.get('media_attachments').size > 0 && !this.props.muted) { if (status.getIn(['media_attachments', 0, 'type']) === 'video') { media = ; } else { diff --git a/app/assets/javascripts/components/features/account/components/header.jsx b/app/assets/javascripts/components/features/account/components/header.jsx index d39a060620..b890e15c19 100644 --- a/app/assets/javascripts/components/features/account/components/header.jsx +++ b/app/assets/javascripts/components/features/account/components/header.jsx @@ -47,7 +47,7 @@ const Header = React.createClass({ const displayNameHTML = { __html: emojify(escapeTextContentForBrowser(displayName)) }; return ( -
+