Mastodon
/
hyperspace-desktop-client-windows-linux-macos
mirror of https://github.com/hyperspacedev/hyperspace
1
0
Fork 0
Code Issues Releases Wiki Activity

keeps reblogger on same line as author when there is enough room

This commit is contained in:
Travis Kohlbeck 2020-02-19 09:10:09 -05:00
parent 78d7b02085
commit f908e8656a
2 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/Post/Post.styles.tsx
View File

@ -11,15 +11,21 @@ export const styles = (theme: Theme) =>
whiteSpace: "nowrap"
},
postHeaderTitle: {
overflow: "hidden",
textOverflow: "ellipsis",
display: 'flex',
flexWrap: 'wrap',
color: theme.palette.text.secondary
},
postAuthorNameAndAccount: {
overflow: 'hidden',
textOverflow: 'ellipsis',
},
postAuthorName: {
whiteSpace: "nowrap",
color: theme.palette.text.primary
},
postAuthorAccount: {
overflow: 'hidden',
textOverflow: 'ellipsis',
marginLeft: theme.spacing.unit * 0.5
},
postReblogChip: {

40
src/components/Post/Post.tsx
View File

@ -412,28 +412,30 @@ export class Post extends React.Component<any, IPostState> {
return (
<>
<span
className={classes.postAuthorName}
dangerouslySetInnerHTML={{
__html: emojifyString(
author.display_name || author.username,
emojis,
classes.postAuthorEmoji
)
}}
></span>
<span
className={classes.postAuthorAccount}
dangerouslySetInnerHTML={{
__html:
"@" +
emojifyString(
author.acct || author.username,
<span className={classes.postAuthorNameAndAccount}>
<span
className={classes.postAuthorName}
dangerouslySetInnerHTML={{
__html: emojifyString(
author.display_name || author.username,
emojis,
classes.postAuthorEmoji
)
}}
></span>
}}
></span>
<span
className={classes.postAuthorAccount}
dangerouslySetInnerHTML={{
__html:
"@" +
emojifyString(
author.acct || author.username,
emojis,
classes.postAuthorEmoji
)
}}
></span>
</span>
{reblogger ? (
<div>
<AutorenewIcon