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

Merge pull request #953 from ThibG/glitch-soc/merge-upstream

Browse Source 
Merge upstream changes
This commit is contained in:
ThibG
2019-03-11 13:23:54 +01:00
committed by GitHub
parent f534f4869e 9c620fc5c8
commit 45e4c90a23
23 changed files with 313 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/javascript/flavours/glitch/components/status_prepend.js
View File

@ -62,6 +62,13 @@ export default class StatusPrepend extends React.PureComponent {
values={{ name : link }}
/>
);
case 'poll':
return (
<FormattedMessage
id='notification.poll'
defaultMessage='Your poll has ended'
/>
);
}
return null;
}
@ -75,7 +82,7 @@ export default class StatusPrepend extends React.PureComponent {
<div className={type === 'reblogged_by' || type === 'featured' ? 'status__prepend-icon-wrapper' : 'notification__favourite-icon-wrapper'}>
<i
className={`fa fa-fw fa-${
type === 'favourite' ? 'star star-icon' : (type === 'featured' ? 'thumb-tack' : 'retweet')
type === 'favourite' ? 'star star-icon' : (type === 'featured' ? 'thumb-tack' : (type === 'poll' ? 'tasks' : 'retweet'))
} status__prepend-icon`}
/>
</div>