mstdn.y-zu.org/mastodon
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix rtl in quote_indicator

Browse Source
This commit is contained in:
noellabo 2020-12-19 10:14:10 +09:00 committed by YoheiZuho
parent c345a1eedd
commit fb9442dcc6
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/javascript/mastodon/features/compose/components/quote_indicator.js
View File

@ -6,11 +6,8 @@ import IconButton from '../../../components/icon_button';
import DisplayName from '../../../components/display_name'; import DisplayName from '../../../components/display_name';
import { defineMessages, injectIntl } from 'react-intl'; import { defineMessages, injectIntl } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
<<<<<<< HEAD
import { isRtl } from '../../../rtl'; import { isRtl } from '../../../rtl';
=======
import AttachmentList from 'mastodon/components/attachment_list'; import AttachmentList from 'mastodon/components/attachment_list';
>>>>>>> 008cc7f1a... fix rtl in quote_indicator
const messages = defineMessages({ const messages = defineMessages({
cancel: { id: 'quote_indicator.cancel', defaultMessage: 'Cancel' }, cancel: { id: 'quote_indicator.cancel', defaultMessage: 'Cancel' },
@ -60,9 +57,6 @@ export default class QuoteIndicator extends ImmutablePureComponent {
</a> </a>
</div> </div>
<<<<<<< HEAD
<div className='quote-indicator__content' style={style} dangerouslySetInnerHTML={content} />
=======
<div className='quote-indicator__content' dir='auto' dangerouslySetInnerHTML={content} /> <div className='quote-indicator__content' dir='auto' dangerouslySetInnerHTML={content} />
{status.get('media_attachments').size > 0 && ( {status.get('media_attachments').size > 0 && (
@ -71,7 +65,6 @@ export default class QuoteIndicator extends ImmutablePureComponent {
media={status.get('media_attachments')} media={status.get('media_attachments')}
/> />
)} )}
>>>>>>> 008cc7f1a... fix rtl in quote_indicator
</div> </div>
); );
} }