Small style fixes (#4206)
* fix(components/media_modal): Center horizontally in Firefox * fix(components/status_list): Do not remove load more button
This commit is contained in:
		
							parent
							
								
									1896a154f5
								
							
						
					
					
						commit
						72bd73f605
					
				| 
						 | 
					@ -6,11 +6,18 @@ export default class LoadMore extends React.PureComponent {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  static propTypes = {
 | 
					  static propTypes = {
 | 
				
			||||||
    onClick: PropTypes.func,
 | 
					    onClick: PropTypes.func,
 | 
				
			||||||
 | 
					    visible: PropTypes.bool,
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  static defaultProps = {
 | 
				
			||||||
 | 
					    visible: true,
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  render() {
 | 
					  render() {
 | 
				
			||||||
 | 
					    const { visible } = this.props;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return (
 | 
					    return (
 | 
				
			||||||
      <button className='load-more' onClick={this.props.onClick}>
 | 
					      <button className='load-more' disabled={!visible} style={{ opacity: visible ? 1 : 0 }} onClick={this.props.onClick}>
 | 
				
			||||||
        <FormattedMessage id='status.load_more' defaultMessage='Load more' />
 | 
					        <FormattedMessage id='status.load_more' defaultMessage='Load more' />
 | 
				
			||||||
      </button>
 | 
					      </button>
 | 
				
			||||||
    );
 | 
					    );
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -101,13 +101,9 @@ export default class StatusList extends ImmutablePureComponent {
 | 
				
			||||||
  render () {
 | 
					  render () {
 | 
				
			||||||
    const { statusIds, scrollKey, trackScroll, shouldUpdateScroll, isLoading, hasMore, prepend, emptyMessage } = this.props;
 | 
					    const { statusIds, scrollKey, trackScroll, shouldUpdateScroll, isLoading, hasMore, prepend, emptyMessage } = this.props;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    let loadMore       = null;
 | 
					    const loadMore     = <LoadMore visible={!isLoading && statusIds.size > 0 && hasMore} onClick={this.handleLoadMore} />;
 | 
				
			||||||
    let scrollableArea = null;
 | 
					    let scrollableArea = null;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (!isLoading && statusIds.size > 0 && hasMore) {
 | 
					 | 
				
			||||||
      loadMore = <LoadMore onClick={this.handleLoadMore} />;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    if (isLoading || statusIds.size > 0 || !emptyMessage) {
 | 
					    if (isLoading || statusIds.size > 0 || !emptyMessage) {
 | 
				
			||||||
      scrollableArea = (
 | 
					      scrollableArea = (
 | 
				
			||||||
        <div className='scrollable' ref={this.setRef}>
 | 
					        <div className='scrollable' ref={this.setRef}>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1314,6 +1314,7 @@
 | 
				
			||||||
.react-swipeable-view-container > * {
 | 
					.react-swipeable-view-container > * {
 | 
				
			||||||
  display: flex;
 | 
					  display: flex;
 | 
				
			||||||
  align-items: center;
 | 
					  align-items: center;
 | 
				
			||||||
 | 
					  justify-content: center;
 | 
				
			||||||
  height: 100%;
 | 
					  height: 100%;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue