mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix compressed notifications again (#393)

pull/394/head
Ash Levy 2018-03-18 13:42:28 -04:00
parent 33d5fe889a
commit c68c1466ac
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -394,22 +394,24 @@ export default class Status extends ImmutablePureComponent {
tabIndex='0' tabIndex='0'
> >
<header className='status__info'> <header className='status__info'>
{prepend && account ? ( <span>
<StatusPrepend {prepend && account ? (
type={prepend} <StatusPrepend
account={account} type={prepend}
parseClick={parseClick} account={account}
notificationId={this.props.notificationId} parseClick={parseClick}
/> notificationId={this.props.notificationId}
) : null} />
{!muted ? ( ) : null}
<StatusHeader {!muted ? (
status={status} <StatusHeader
friend={account} status={status}
collapsed={isExpanded === false} friend={account}
parseClick={parseClick} collapsed={isExpanded === false}
/> parseClick={parseClick}
) : null} />
) : null}
</span>
<StatusIcons <StatusIcons
status={status} status={status}
mediaIcon={mediaIcon} mediaIcon={mediaIcon}

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

@ -294,17 +294,15 @@
} }
.status__info { .status__info {
position: relative; display: flex;
padding: 2px 0 5px; padding: 2px 0 5px;
font-size: 15px; font-size: 15px;
line-height: 24px; line-height: 24px;
} }
.status__info__icons { .status__info__icons {
position: absolute; margin-left: auto;
color: lighten($ui-base-color, 26%); color: lighten($ui-base-color, 26%);
top: 0;
right: 0;
.status__visibility-icon { .status__visibility-icon {
padding-left: 6px; padding-left: 6px;