diff options
author | Ash Levy <ashlea@protonmail.com> | 2018-03-18 13:42:28 -0400 |
---|---|---|
committer | Ash Levy <ashlea@protonmail.com> | 2018-03-18 13:42:28 -0400 |
commit | c68c1466ac97ae1ef772c6168264d21b0001e802 (patch) | |
tree | f8ee77d89afb115a24c5d9ed321e7f2c087b1564 /app/javascript/flavours | |
parent | 33d5fe889ada62645031ab539e29e9c5aa1466d2 (diff) |
fix compressed notifications again (#393)
Diffstat (limited to 'app/javascript/flavours')
-rw-r--r-- | app/javascript/flavours/glitch/components/status.js | 34 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/styles/components/status.scss | 6 |
2 files changed, 20 insertions, 20 deletions
diff --git a/app/javascript/flavours/glitch/components/status.js b/app/javascript/flavours/glitch/components/status.js index e8105e705..b8fb5383a 100644 --- a/app/javascript/flavours/glitch/components/status.js +++ b/app/javascript/flavours/glitch/components/status.js @@ -394,22 +394,24 @@ export default class Status extends ImmutablePureComponent { tabIndex='0' > <header className='status__info'> - {prepend && account ? ( - <StatusPrepend - type={prepend} - account={account} - parseClick={parseClick} - notificationId={this.props.notificationId} - /> - ) : null} - {!muted ? ( - <StatusHeader - status={status} - friend={account} - collapsed={isExpanded === false} - parseClick={parseClick} - /> - ) : null} + <span> + {prepend && account ? ( + <StatusPrepend + type={prepend} + account={account} + parseClick={parseClick} + notificationId={this.props.notificationId} + /> + ) : null} + {!muted ? ( + <StatusHeader + status={status} + friend={account} + collapsed={isExpanded === false} + parseClick={parseClick} + /> + ) : null} + </span> <StatusIcons status={status} mediaIcon={mediaIcon} diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss index 5cce50589..6e4241130 100644 --- a/app/javascript/flavours/glitch/styles/components/status.scss +++ b/app/javascript/flavours/glitch/styles/components/status.scss @@ -294,17 +294,15 @@ } .status__info { - position: relative; + display: flex; padding: 2px 0 5px; font-size: 15px; line-height: 24px; } .status__info__icons { - position: absolute; + margin-left: auto; color: lighten($ui-base-color, 26%); - top: 0; - right: 0; .status__visibility-icon { padding-left: 6px; |