diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 14:33:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-12 14:33:14 +0100 |
| commit | 81b1d32d5b618daa4003b8de8292ae4dd3e656f6 (patch) | |
| tree | 5cdf443e718788f8473148ce4d4205da54efbf04 /app/javascript/flavours/glitch/features/about/index.js | |
| parent | d37f426f95f812b44925e13c00eabb9d1cd76b1f (diff) | |
| parent | a808ac1fd8d4a42ee930bbb30cb6b58c810f828b (diff) | |
Merge pull request #1920 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/about/index.js')
| -rw-r--r-- | app/javascript/flavours/glitch/features/about/index.js | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/app/javascript/flavours/glitch/features/about/index.js b/app/javascript/flavours/glitch/features/about/index.js index 4129c8236..57f295ea9 100644 --- a/app/javascript/flavours/glitch/features/about/index.js +++ b/app/javascript/flavours/glitch/features/about/index.js @@ -183,25 +183,18 @@ class About extends React.PureComponent { <> <p><FormattedMessage id='about.domain_blocks.preamble' defaultMessage='Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.' /></p> - <table className='about__domain-blocks'> - <thead> - <tr> - <th><FormattedMessage id='about.domain_blocks.domain' defaultMessage='Domain' /></th> - <th><FormattedMessage id='about.domain_blocks.severity' defaultMessage='Severity' /></th> - <th><FormattedMessage id='about.domain_blocks.comment' defaultMessage='Reason' /></th> - </tr> - </thead> - - <tbody> - {domainBlocks.get('items').map(block => ( - <tr key={block.get('domain')}> - <td><span title={`SHA-256: ${block.get('digest')}`}>{block.get('domain')}</span></td> - <td><span title={intl.formatMessage(severityMessages[block.get('severity')].explanation)}>{intl.formatMessage(severityMessages[block.get('severity')].title)}</span></td> - <td>{block.get('comment')}</td> - </tr> - ))} - </tbody> - </table> + <div className='about__domain-blocks'> + {domainBlocks.get('items').map(block => ( + <div className='about__domain-blocks__domain' key={block.get('domain')}> + <div className='about__domain-blocks__domain__header'> + <h6><span title={`SHA-256: ${block.get('digest')}`}>{block.get('domain')}</span></h6> + <span className='about__domain-blocks__domain__type' title={intl.formatMessage(severityMessages[block.get('severity')].explanation)}>{intl.formatMessage(severityMessages[block.get('severity')].title)}</span> + </div> + + <p>{(block.get('comment') || '').length > 0 ? block.get('comment') : <FormattedMessage id='about.domain_blocks.no_reason_available' defaultMessage='Reason not available' />}</p> + </div> + ))} + </div> </> ) : ( <p><FormattedMessage id='about.not_available' defaultMessage='This information has not been made available on this server.' /></p> |