mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-20 11:35:29 +01:00
Code Issues Projects Releases Wiki Activity

Add “In Memoriam” banner back to profiles (#23614)

Browse Source
This commit is contained in:
Claire 2023-04-12 14:50:02 +02:00 committed by GitHub
parent 722c0011d1
commit 86ad43173f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/account_timeline/components/header.jsx
View File

@ -3,6 +3,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import InnerHeader from '../../account/components/header'; import InnerHeader from '../../account/components/header';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
import MemorialNote from './memorial_note';
import MovedNote from './moved_note'; import MovedNote from './moved_note';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import { NavLink } from 'react-router-dom'; import { NavLink } from 'react-router-dom';
@ -115,6 +116,7 @@ export default class Header extends ImmutablePureComponent {
return ( return (
<div className='account-timeline__header'> <div className='account-timeline__header'>
{(!hidden && account.get('memorial')) && <MemorialNote />}
{(!hidden && account.get('moved')) && <MovedNote from={account} to={account.get('moved')} />} {(!hidden && account.get('moved')) && <MovedNote from={account} to={account.get('moved')} />}
<InnerHeader <InnerHeader

12
app/javascript/mastodon/features/account_timeline/components/memorial_note.jsx Normal file
View File

@ -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;

7
app/javascript/styles/mastodon/components.scss
View File

@ -6963,7 +6963,8 @@ noscript {
} }
.moved-account-banner, .moved-account-banner,
.follow-request-banner { .follow-request-banner,
.account-memorial-banner {
padding: 20px; padding: 20px;
background: lighten($ui-base-color, 4%); background: lighten($ui-base-color, 4%);
display: flex; display: flex;
@ -6998,6 +6999,10 @@ noscript {
width: 100%; width: 100%;
} }
.account-memorial-banner__message {
margin-bottom: 0;
}
.column-inline-form { .column-inline-form {
padding: 15px; padding: 15px;
display: flex; display: flex;