djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-24 09:04:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Small style fixes (#4206)

Browse Source 
* fix(components/media_modal): Center horizontally in Firefox

* fix(components/status_list): Do not remove load more button
This commit is contained in:
Sorin Davidoi 2017-07-14 22:31:25 +02:00 committed by Eugen Rochko
parent 1896a154f5
commit 72bd73f605
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/javascript/mastodon/components/load_more.js
View File

@ -6,11 +6,18 @@ export default class LoadMore extends React.PureComponent {
static propTypes = {
onClick: PropTypes.func,
visible: PropTypes.bool,
}
static defaultProps = {
visible: true,
}
render() {
const { visible } = this.props;
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' />
</button>
);

6
app/javascript/mastodon/components/status_list.js
View File

@ -101,13 +101,9 @@ export default class StatusList extends ImmutablePureComponent {
render () {
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;
if (!isLoading && statusIds.size > 0 && hasMore) {
loadMore = <LoadMore onClick={this.handleLoadMore} />;
}
if (isLoading || statusIds.size > 0 || !emptyMessage) {
scrollableArea = (
<div className='scrollable' ref={this.setRef}>

1
app/javascript/styles/components.scss
View File

@ -1314,6 +1314,7 @@
.react-swipeable-view-container > * {
display: flex;
align-items: center;
justify-content: center;
height: 100%;
}