Skip to content

Commit

Permalink
Port mastodon#23614 to Glitch (Add “In Memoriam” banner back to profi…
Browse files Browse the repository at this point in the history
…les)
  • Loading branch information
neatchee committed Apr 12, 2023
1 parent bed63f6 commit 3c9aec2
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
import InnerHeader from 'flavours/glitch/features/account/components/header';
import ActionBar from 'flavours/glitch/features/account/components/action_bar';
import ImmutablePureComponent from 'react-immutable-pure-component';
import MemorialNote from './memorial_note';
import { FormattedMessage } from 'react-intl';
import { NavLink } from 'react-router-dom';
import MovedNote from './moved_note';
Expand Down Expand Up @@ -116,6 +117,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
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,8 @@
}

.moved-account-banner,
.follow-request-banner {
.follow-request-banner,
.account-memorial-banner {
padding: 20px;
background: lighten($ui-base-color, 4%);
display: flex;
Expand Down Expand Up @@ -803,3 +804,7 @@
.follow-request-banner .button {
width: 100%;
}

.account-memorial-banner__message {
margin-bottom: 0;
}

0 comments on commit 3c9aec2

Please sign in to comment.