Browse Source

fix compressed notifications again (#393)

closed-social-glitch-2
Ash Levy 6 years ago
parent
commit
c68c1466ac
2 changed files with 20 additions and 20 deletions
  1. +18
    -16
      app/javascript/flavours/glitch/components/status.js
  2. +2
    -4
      app/javascript/flavours/glitch/styles/components/status.scss

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

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

+ 2
- 4
app/javascript/flavours/glitch/styles/components/status.scss View File

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

Loading…
Cancel
Save