mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add a border above the timeline hint for statuses with replies (#31387)

pull/2813/head
Renaud Chaput 2024-08-13 09:14:41 +02:00 committed by GitHub
parent b42661ba95
commit 7e501c59c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/javascript/mastodon/components/timeline_hint.tsx
View File

@ -1,12 +1,15 @@
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import classNames from 'classnames';
interface Props { interface Props {
resource: JSX.Element; resource: JSX.Element;
url: string; url: string;
className?: string;
} }
export const TimelineHint: React.FC<Props> = ({ resource, url }) => ( export const TimelineHint: React.FC<Props> = ({ className, resource, url }) => (
<div className='timeline-hint'> <div className={classNames('timeline-hint', className)}>
<strong> <strong>
<FormattedMessage <FormattedMessage
id='timeline_hint.remote_resource_not_displayed' id='timeline_hint.remote_resource_not_displayed'

2
app/javascript/mastodon/features/status/index.jsx
View File

@ -629,7 +629,7 @@ class Status extends ImmutablePureComponent {
const isIndexable = !status.getIn(['account', 'noindex']); const isIndexable = !status.getIn(['account', 'noindex']);
if (!isLocal) { if (!isLocal) {
remoteHint = <TimelineHint url={status.get('url')} resource={<FormattedMessage id='timeline_hint.resources.replies' defaultMessage='Some replies' />} />; remoteHint = <TimelineHint className={classNames(!!descendants && 'timeline-hint--with-descendants')} url={status.get('url')} resource={<FormattedMessage id='timeline_hint.resources.replies' defaultMessage='Some replies' />} />;
} }
const handlers = { const handlers = {

4
app/javascript/styles/mastodon/components.scss
View File

@ -4248,6 +4248,10 @@ a.status-card {
} }
} }
.timeline-hint--with-descendants {
border-top: 1px solid var(--background-border-color);
}
.regeneration-indicator { .regeneration-indicator {
text-align: center; text-align: center;
font-size: 16px; font-size: 16px;