forked from asonix/mastodon
Resolve confusion between ColumnBackButton and the slim version that
the public timeline has been using
This commit is contained in:
parent
b1571b1e1d
commit
9bde804ba2
5 changed files with 18 additions and 18 deletions
|
@ -18,7 +18,7 @@ const iconStyle = {
|
||||||
marginRight: '5px'
|
marginRight: '5px'
|
||||||
};
|
};
|
||||||
|
|
||||||
const ColumnBackButton = React.createClass({
|
const ColumnBackButtonSlim = React.createClass({
|
||||||
|
|
||||||
contextTypes: {
|
contextTypes: {
|
||||||
router: React.PropTypes.object
|
router: React.PropTypes.object
|
||||||
|
@ -43,4 +43,4 @@ const ColumnBackButton = React.createClass({
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export default ColumnBackButton;
|
export default ColumnBackButtonSlim;
|
|
@ -5,7 +5,7 @@ import LoadingIndicator from '../../components/loading_indicator';
|
||||||
import { fetchFavouritedStatuses, expandFavouritedStatuses } from '../../actions/favourites';
|
import { fetchFavouritedStatuses, expandFavouritedStatuses } from '../../actions/favourites';
|
||||||
import Column from '../ui/components/column';
|
import Column from '../ui/components/column';
|
||||||
import StatusList from '../../components/status_list';
|
import StatusList from '../../components/status_list';
|
||||||
import ColumnBackButton from '../public_timeline/components/column_back_button';
|
import ColumnBackButtonSlim from '../../components/column_back_button_slim';
|
||||||
import { defineMessages, injectIntl } from 'react-intl';
|
import { defineMessages, injectIntl } from 'react-intl';
|
||||||
|
|
||||||
const messages = defineMessages({
|
const messages = defineMessages({
|
||||||
|
@ -52,7 +52,7 @@ const Favourites = React.createClass({
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Column icon='star' heading={intl.formatMessage(messages.heading)}>
|
<Column icon='star' heading={intl.formatMessage(messages.heading)}>
|
||||||
<ColumnBackButton />
|
<ColumnBackButtonSlim />
|
||||||
<StatusList statusIds={statusIds} me={me} onScrollToBottom={this.handleScrollToBottom} />
|
<StatusList statusIds={statusIds} me={me} onScrollToBottom={this.handleScrollToBottom} />
|
||||||
</Column>
|
</Column>
|
||||||
);
|
);
|
||||||
|
|
|
@ -4,7 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||||
import LoadingIndicator from '../../components/loading_indicator';
|
import LoadingIndicator from '../../components/loading_indicator';
|
||||||
import { ScrollContainer } from 'react-router-scroll';
|
import { ScrollContainer } from 'react-router-scroll';
|
||||||
import Column from '../ui/components/column';
|
import Column from '../ui/components/column';
|
||||||
import ColumnBackButton from '../../components/column_back_button';
|
import ColumnBackButtonSlim from '../../components/column_back_button_slim';
|
||||||
import AccountAuthorizeContainer from './containers/account_authorize_container';
|
import AccountAuthorizeContainer from './containers/account_authorize_container';
|
||||||
import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts';
|
import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts';
|
||||||
import { defineMessages, injectIntl } from 'react-intl';
|
import { defineMessages, injectIntl } from 'react-intl';
|
||||||
|
@ -52,7 +52,7 @@ const FollowRequests = React.createClass({
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Column icon='users' heading={intl.formatMessage(messages.heading)}>
|
<Column icon='users' heading={intl.formatMessage(messages.heading)}>
|
||||||
<ColumnBackButton />
|
<ColumnBackButtonSlim />
|
||||||
<ScrollContainer scrollKey='follow_requests'>
|
<ScrollContainer scrollKey='follow_requests'>
|
||||||
<div className='scrollable' onScroll={this.handleScroll}>
|
<div className='scrollable' onScroll={this.handleScroll}>
|
||||||
{accountIds.map(id =>
|
{accountIds.map(id =>
|
||||||
|
|
|
@ -7,7 +7,7 @@ import {
|
||||||
updateTimeline,
|
updateTimeline,
|
||||||
deleteFromTimelines
|
deleteFromTimelines
|
||||||
} from '../../actions/timelines';
|
} from '../../actions/timelines';
|
||||||
import ColumnBackButton from '../public_timeline/components/column_back_button';
|
import ColumnBackButtonSlim from '../../components/column_back_button_slim';
|
||||||
|
|
||||||
const HashtagTimeline = React.createClass({
|
const HashtagTimeline = React.createClass({
|
||||||
|
|
||||||
|
@ -69,7 +69,7 @@ const HashtagTimeline = React.createClass({
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Column icon='hashtag' heading={id}>
|
<Column icon='hashtag' heading={id}>
|
||||||
<ColumnBackButton />
|
<ColumnBackButtonSlim />
|
||||||
<StatusListContainer type='tag' id={id} />
|
<StatusListContainer type='tag' id={id} />
|
||||||
</Column>
|
</Column>
|
||||||
);
|
);
|
||||||
|
|
|
@ -8,7 +8,7 @@ import {
|
||||||
deleteFromTimelines
|
deleteFromTimelines
|
||||||
} from '../../actions/timelines';
|
} from '../../actions/timelines';
|
||||||
import { defineMessages, injectIntl } from 'react-intl';
|
import { defineMessages, injectIntl } from 'react-intl';
|
||||||
import ColumnBackButton from './components/column_back_button';
|
import ColumnBackButtonSlim from '../../components/column_back_button_slim';
|
||||||
|
|
||||||
const messages = defineMessages({
|
const messages = defineMessages({
|
||||||
title: { id: 'column.public', defaultMessage: 'Public' }
|
title: { id: 'column.public', defaultMessage: 'Public' }
|
||||||
|
@ -55,7 +55,7 @@ const PublicTimeline = React.createClass({
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Column icon='globe' heading={intl.formatMessage(messages.title)}>
|
<Column icon='globe' heading={intl.formatMessage(messages.title)}>
|
||||||
<ColumnBackButton />
|
<ColumnBackButtonSlim />
|
||||||
<StatusListContainer type='public' />
|
<StatusListContainer type='public' />
|
||||||
</Column>
|
</Column>
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in a new issue