matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into gdpr

Browse Source
This commit is contained in:
Alex Gleason
2022-07-26 10:32:15 -05:00
parent 0480bfab94 fa8f4b7a2a
commit af6cb3a4c2
20 changed files with 191 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/soapbox/features/ui/components/boost_modal.tsx
View File

@@ -38,7 +38,7 @@ const BoostModal: React.FC<IBoostModal> = ({ status, onReblog, onClose }) => {
<ReplyIndicator status={status} hideActions />
<Text>
<FormattedMessage id='boost_modal.combo' defaultMessage='You can press {combo} to skip this next time' values={{ combo: <span>Shift + <Icon id='retweet' /></span> }} />
<FormattedMessage id='boost_modal.combo' defaultMessage='You can press {combo} to skip this next time' values={{ combo: <span>Shift + <Icon className='inline-block align-middle' src={require('@tabler/icons/repeat.svg')} /></span> }} />
</Text>
</Stack>
</Modal>

2
app/soapbox/features/ui/components/profile_fields_panel.tsx
View File

@@ -65,7 +65,7 @@ const ProfileField: React.FC<IProfileField> = ({ field }) => {
</span>
)}
<Text tag='span' dangerouslySetInnerHTML={{ __html: field.value_emojified }} />
<Text className='break-words overflow-hidden' tag='span' dangerouslySetInnerHTML={{ __html: field.value_emojified }} />
</HStack>
</dd>
</dl>