Merge pull request #394 from ashkitten/compressed-notifs
fix compressed notifications again (#393)
This commit is contained in:
commit
bdeaef116e
2 changed files with 26 additions and 21 deletions
|
@ -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}
|
||||||
|
|
|
@ -289,21 +289,24 @@
|
||||||
.status__info__account .status__display-name {
|
.status__info__account .status__display-name {
|
||||||
display: block;
|
display: block;
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
padding-right: 25px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.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;
|
||||||
|
|
||||||
|
> span {
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.status__info__icons {
|
.status__info__icons {
|
||||||
position: absolute;
|
margin-left: auto;
|
||||||
|
display: flex;
|
||||||
|
align-items: baseline;
|
||||||
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;
|
||||||
|
|
Loading…
Reference in a new issue