diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-28 19:51:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-28 19:51:36 +0200 |
| commit | 14563f51674aa601b7684dc62a394469a9634c4d (patch) | |
| tree | 3ed84be5da351d2819fcc6088c273e34c9c86846 /app/javascript | |
| parent | 3fe5029fbec1e328d95b768f6bd40fec8af0906c (diff) | |
| parent | 43d132039bf0fdd8c6bc6e2a1d2fe3ef59c0710f (diff) | |
Merge pull request #684 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/mastodon/components/status.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js index 7090c12d0..43647acc0 100644 --- a/app/javascript/mastodon/components/status.js +++ b/app/javascript/mastodon/components/status.js @@ -269,10 +269,10 @@ export default class Status extends ImmutablePureComponent { return ( <HotKeys handlers={handlers}> - <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { focusable: !this.props.muted })} tabIndex={this.props.muted ? null : 0} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText, !status.get('hidden'))}> + <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), focusable: !this.props.muted })} tabIndex={this.props.muted ? null : 0} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText, !status.get('hidden'))}> {prepend} - <div className={classNames('status', `status-${status.get('visibility')}`, { muted: this.props.muted })} data-id={status.get('id')}> + <div className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), muted: this.props.muted })} data-id={status.get('id')}> <div className='status__info'> <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener'><RelativeTimestamp timestamp={status.get('created_at')} /></a> |