tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #471 from impiaaa/thread-icon

Browse Source 
Add an extra icon to indicate that a status is part of a conversation
This commit is contained in:
David Yip 2018-06-01 00:35:13 -05:00 committed by GitHub
commit 0aba716fe1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/flavours/glitch/components/status_icons.js
View File

@ -47,9 +47,15 @@ export default class StatusIcons extends React.PureComponent {
return ( return (
<div className='status__info__icons'> <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 ? ( {mediaIcon ? (
<i <i
className={`fa fa-fw fa-${mediaIcon}`} className={`fa fa-fw fa-${mediaIcon} status__media-icon`}
aria-hidden='true' aria-hidden='true'
/> />
) : null} ) : null}

7
app/javascript/flavours/glitch/styles/components/status.scss
View File

@ -331,8 +331,13 @@
height: 1em; height: 1em;
color: $action-button-color; color: $action-button-color;
.status__visibility-icon { .status__media-icon {
padding-left: 6px; padding-left: 6px;
padding-right: 1px;
}
.status__visibility-icon {
padding-left: 4px;
} }
} }