3 files changed, 20 insertions(+), 1 deletions(-)

M app/javascript/mastodon/features/account_timeline/components/header.jsx
A app/javascript/mastodon/features/account_timeline/components/memorial_note.jsx
M app/javascript/styles/mastodon/components.scss

@@ 3,6 3,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import InnerHeader from '../../account/components/header';
 import ImmutablePureComponent from 'react-immutable-pure-component';
+import MemorialNote from './memorial_note';
 import MovedNote from './moved_note';
 import { FormattedMessage } from 'react-intl';
 import { NavLink } from 'react-router-dom';


@@ 115,6 116,7 @@ export default class Header extends ImmutablePureComponent {
 
     return (
       <div className='account-timeline__header'>
+        {(!hidden && account.get('memorial')) && <MemorialNote />}
         {(!hidden && account.get('moved')) && <MovedNote from={account} to={account.get('moved')} />}
 
         <InnerHeader

@@ 0,0 1,12 @@
+import React from 'react';
+import { FormattedMessage } from 'react-intl';
+
+const MemorialNote = () => (
+  <div className='account-memorial-banner'>
+    <div className='account-memorial-banner__message'>
+      <FormattedMessage id='account.in_memoriam' defaultMessage='In Memoriam.' />
+    </div>
+  </div>
+);
+
+export default MemorialNote;

@@ 6963,7 6963,8 @@ noscript {
 }
 
 .moved-account-banner,
-.follow-request-banner {
+.follow-request-banner,
+.account-memorial-banner {
   padding: 20px;
   background: lighten($ui-base-color, 4%);
   display: flex;


@@ 6998,6 6999,10 @@ noscript {
   width: 100%;
 }
 
+.account-memorial-banner__message {
+  margin-bottom: 0;
+}
+
 .column-inline-form {
   padding: 15px;
   display: flex;