treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix status prepend design (#1874) 

* Fix status prepend design

* Adjust status prepend styling a bit
remotes/1703361221475462875/rebase/4.0.0rc1
Claire 2022-10-28 08:47:10 +02:00 committed by GitHub
parent b3030187a4
commit 19765216a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/javascript/flavours/glitch/components/status.js
View File

@ -749,16 +749,16 @@ class Status extends ImmutablePureComponent {
data-featured={featured ? 'true' : null} data-featured={featured ? 'true' : null}
aria-label={textForScreenReader(intl, status, rebloggedByText, !status.get('hidden'))} aria-label={textForScreenReader(intl, status, rebloggedByText, !status.get('hidden'))}
> >
{prepend && account && (
<StatusPrepend
type={prepend}
account={account}
parseClick={parseClick}
notificationId={this.props.notificationId}
/>
)}
<header className='status__info'> <header className='status__info'>
<span> <span>
{prepend && account ? (
<StatusPrepend
type={prepend}
account={account}
parseClick={parseClick}
notificationId={this.props.notificationId}
/>
) : null}
{!muted || !isCollapsed ? ( {!muted || !isCollapsed ? (
<StatusHeader <StatusHeader
status={status} status={status}

6
app/javascript/flavours/glitch/styles/components/status.scss
View File

@ -555,12 +555,10 @@
} }
.status__prepend { .status__prepend {
margin-top: -10px; margin-top: -2px;
margin-bottom: 10px; margin-bottom: 8px;
margin-left: 58px; margin-left: 58px;
color: $dark-text-color; color: $dark-text-color;
padding: 8px 0;
padding-bottom: 2px;
font-size: 14px; font-size: 14px;
position: relative; position: relative;