diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-06-01 00:35:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-01 00:35:13 -0500 |
| commit | 0aba716fe1596376443cfe793fa8915e66931622 (patch) | |
| tree | 790cd7d374b5ecd4ace56293f9d5394268f4222d | |
| parent | e396fbfe3bf4d2a404e78e73cff1a609dd0a9bfb (diff) | |
| parent | e5f25a73f21998188f8cc15584134744ff7e15b3 (diff) | |
Merge pull request #471 from impiaaa/thread-icon
Add an extra icon to indicate that a status is part of a conversation
| -rw-r--r-- | app/javascript/flavours/glitch/components/status_icons.js | 8 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/styles/components/status.scss | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/components/status_icons.js b/app/javascript/flavours/glitch/components/status_icons.js index e354c45e4..c9747650f 100644 --- a/app/javascript/flavours/glitch/components/status_icons.js +++ b/app/javascript/flavours/glitch/components/status_icons.js @@ -47,9 +47,15 @@ export default class StatusIcons extends React.PureComponent { return ( <div className='status__info__icons'> + {status.get('in_reply_to_id', null) !== null ? ( + <i + className={`fa fa-fw fa-comment status__reply-icon`} + aria-hidden='true' + /> + ) : null} {mediaIcon ? ( <i - className={`fa fa-fw fa-${mediaIcon}`} + className={`fa fa-fw fa-${mediaIcon} status__media-icon`} aria-hidden='true' /> ) : null} diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss index 733845c5f..2b31e2dcb 100644 --- a/app/javascript/flavours/glitch/styles/components/status.scss +++ b/app/javascript/flavours/glitch/styles/components/status.scss @@ -331,8 +331,13 @@ height: 1em; color: $action-button-color; - .status__visibility-icon { + .status__media-icon { padding-left: 6px; + padding-right: 1px; + } + + .status__visibility-icon { + padding-left: 4px; } } |