From d6e6a036b4118bac56b1d7b35ec800e165a86364 Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 12 Apr 2023 14:50:02 +0200 Subject: [PATCH] =?UTF-8?q?[Glitch]=20Add=20=E2=80=9CIn=20Memoriam?= =?UTF-8?q?=E2=80=9D=20banner=20back=20to=20profiles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Port e5498861d40443f8e35237cdbf28533f937ff583 to glitch-soc Signed-off-by: Claire --- .../features/account_timeline/components/header.jsx | 2 ++ .../account_timeline/components/memorial_note.jsx | 12 ++++++++++++ .../flavours/glitch/styles/components/accounts.scss | 7 ++++++- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 app/javascript/flavours/glitch/features/account_timeline/components/memorial_note.jsx diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx b/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx index eec065b437..9b3c273bc2 100644 --- a/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx +++ b/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx @@ -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'; @@ -116,6 +117,7 @@ export default class Header extends ImmutablePureComponent { return (
+ {(!hidden && account.get('memorial')) && } {(!hidden && account.get('moved')) && } ( +
+
+ +
+
+); + +export default MemorialNote; diff --git a/app/javascript/flavours/glitch/styles/components/accounts.scss b/app/javascript/flavours/glitch/styles/components/accounts.scss index 5f144300dc..374f469077 100644 --- a/app/javascript/flavours/glitch/styles/components/accounts.scss +++ b/app/javascript/flavours/glitch/styles/components/accounts.scss @@ -770,7 +770,8 @@ } .moved-account-banner, -.follow-request-banner { +.follow-request-banner, +.account-memorial-banner { padding: 20px; background: lighten($ui-base-color, 4%); display: flex; @@ -804,3 +805,7 @@ .follow-request-banner .button { width: 100%; } + +.account-memorial-banner__message { + margin-bottom: 0; +}