djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-27 18:13:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix interaction between CWs and hashtag bars

Browse Source
This commit is contained in:
Claire 2023-08-25 21:54:15 +02:00
parent 7ae45676c8
commit c226d00490
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/components/status.jsx
View File

@ -781,7 +781,7 @@ class Status extends ImmutablePureComponent {
}, 'focusable'); }, 'focusable');
const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status); const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
media.push(hashtagBar); contentMedia.push(hashtagBar);
return ( return (
<HotKeys handlers={handlers}> <HotKeys handlers={handlers}>

3
app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
View File

@ -305,6 +305,7 @@ class DetailedStatus extends ImmutablePureComponent {
} }
const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status); const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
contentMedia.push(hashtagBar);
return ( return (
<div style={outerStyle}> <div style={outerStyle}>
@ -331,8 +332,6 @@ class DetailedStatus extends ImmutablePureComponent {
{...statusContentProps} {...statusContentProps}
/> />
{hashtagBar}
<div className='detailed-status__meta'> <div className='detailed-status__meta'>
<a className='detailed-status__datetime' href={status.get('url')} target='_blank' rel='noopener noreferrer'> <a className='detailed-status__datetime' href={status.get('url')} target='_blank' rel='noopener noreferrer'>
<FormattedDate value={new Date(status.get('created_at'))} hour12={false} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' /> <FormattedDate value={new Date(status.get('created_at'))} hour12={false} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />