Fix minor design issues with fav confirmation modal
This commit is contained in:
		
							parent
							
								
									339f78fb63
								
							
						
					
					
						commit
						8ffae82fa6
					
				@ -7,11 +7,17 @@ import StatusContent from 'flavours/glitch/components/status_content';
 | 
				
			|||||||
import Avatar from 'flavours/glitch/components/avatar';
 | 
					import Avatar from 'flavours/glitch/components/avatar';
 | 
				
			||||||
import RelativeTimestamp from 'flavours/glitch/components/relative_timestamp';
 | 
					import RelativeTimestamp from 'flavours/glitch/components/relative_timestamp';
 | 
				
			||||||
import DisplayName from 'flavours/glitch/components/display_name';
 | 
					import DisplayName from 'flavours/glitch/components/display_name';
 | 
				
			||||||
 | 
					import AttachmentList from 'flavours/glitch/components/attachment_list';
 | 
				
			||||||
import Icon from 'flavours/glitch/components/icon';
 | 
					import Icon from 'flavours/glitch/components/icon';
 | 
				
			||||||
import ImmutablePureComponent from 'react-immutable-pure-component';
 | 
					import ImmutablePureComponent from 'react-immutable-pure-component';
 | 
				
			||||||
 | 
					import classNames from 'classnames';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const messages = defineMessages({
 | 
					const messages = defineMessages({
 | 
				
			||||||
  favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
 | 
					  favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
 | 
				
			||||||
 | 
					  public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
 | 
				
			||||||
 | 
					  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
 | 
				
			||||||
 | 
					  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers-only' },
 | 
				
			||||||
 | 
					  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
 | 
				
			||||||
});
 | 
					});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export default @injectIntl
 | 
					export default @injectIntl
 | 
				
			||||||
@ -54,13 +60,25 @@ class FavouriteModal extends ImmutablePureComponent {
 | 
				
			|||||||
  render () {
 | 
					  render () {
 | 
				
			||||||
    const { status, intl } = this.props;
 | 
					    const { status, intl } = this.props;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    const visibilityIconInfo = {
 | 
				
			||||||
 | 
					      'public': { icon: 'globe', text: intl.formatMessage(messages.public_short) },
 | 
				
			||||||
 | 
					      'unlisted': { icon: 'unlock', text: intl.formatMessage(messages.unlisted_short) },
 | 
				
			||||||
 | 
					      'private': { icon: 'lock', text: intl.formatMessage(messages.private_short) },
 | 
				
			||||||
 | 
					      'direct': { icon: 'envelope', text: intl.formatMessage(messages.direct_short) },
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    const visibilityIcon = visibilityIconInfo[status.get('visibility')];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return (
 | 
					    return (
 | 
				
			||||||
      <div className='modal-root__modal favourite-modal'>
 | 
					      <div className='modal-root__modal favourite-modal'>
 | 
				
			||||||
        <div className='favourite-modal__container'>
 | 
					        <div className='favourite-modal__container'>
 | 
				
			||||||
          <div className='status light'>
 | 
					          <div className={classNames('status', `status-${status.get('visibility')}`, 'light')}>
 | 
				
			||||||
            <div className='favourite-modal__status-header'>
 | 
					            <div className='favourite-modal__status-header'>
 | 
				
			||||||
              <div className='favourite-modal__status-time'>
 | 
					              <div className='favourite-modal__status-time'>
 | 
				
			||||||
                <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener'><RelativeTimestamp timestamp={status.get('created_at')} /></a>
 | 
					                <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
 | 
				
			||||||
 | 
					                  <span className='status__visibility-icon'><Icon id={visibilityIcon.icon} title={visibilityIcon.text} /></span>
 | 
				
			||||||
 | 
					                  <RelativeTimestamp timestamp={status.get('created_at')} />
 | 
				
			||||||
 | 
					                </a>
 | 
				
			||||||
              </div>
 | 
					              </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
              <a onClick={this.handleAccountClick} href={status.getIn(['account', 'url'])} className='status__display-name'>
 | 
					              <a onClick={this.handleAccountClick} href={status.getIn(['account', 'url'])} className='status__display-name'>
 | 
				
			||||||
@ -69,10 +87,18 @@ class FavouriteModal extends ImmutablePureComponent {
 | 
				
			|||||||
                </div>
 | 
					                </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                <DisplayName account={status.get('account')} />
 | 
					                <DisplayName account={status.get('account')} />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
              </a>
 | 
					              </a>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            <StatusContent status={status} />
 | 
					            <StatusContent status={status} />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            {status.get('media_attachments').size > 0 && (
 | 
				
			||||||
 | 
					              <AttachmentList
 | 
				
			||||||
 | 
					                compact
 | 
				
			||||||
 | 
					                media={status.get('media_attachments')}
 | 
				
			||||||
 | 
					              />
 | 
				
			||||||
 | 
					            )}
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user