From b6bec67eeac546a4096d263552b6380ea0bd23fb Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 24 Dec 2020 16:39:57 -0600 Subject: [PATCH] RemoteTimeline: add filter box --- app/soapbox/features/remote_timeline/index.js | 15 ++++++++++++++- app/styles/components/columns.scss | 10 ++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/app/soapbox/features/remote_timeline/index.js b/app/soapbox/features/remote_timeline/index.js index b5d6cdb8f..7094c8ddb 100644 --- a/app/soapbox/features/remote_timeline/index.js +++ b/app/soapbox/features/remote_timeline/index.js @@ -6,6 +6,7 @@ import StatusListContainer from '../ui/containers/status_list_container'; import Column from '../../components/column'; import ColumnSettingsContainer from './containers/column_settings_container'; import HomeColumnHeader from '../../components/home_column_header'; +import IconButton from 'soapbox/components/icon_button'; import { expandRemoteTimeline } from '../../actions/timelines'; import { connectRemoteStream } from '../../actions/streaming'; import { getSettings } from 'soapbox/actions/settings'; @@ -69,6 +70,10 @@ class RemoteTimeline extends React.PureComponent { } } + handleCloseClick = e => { + this.context.router.history.push('/timeline/fediverse'); + } + handleLoadMore = maxId => { const { dispatch, onlyMedia, instance } = this.props; dispatch(expandRemoteTimeline(instance, { maxId, onlyMedia })); @@ -82,6 +87,14 @@ class RemoteTimeline extends React.PureComponent { +
+ + +
} diff --git a/app/styles/components/columns.scss b/app/styles/components/columns.scss index a3f2dac95..a2f430538 100644 --- a/app/styles/components/columns.scss +++ b/app/styles/components/columns.scss @@ -716,3 +716,13 @@ color: white; } } + +.timeline-filter-message { + background-color: var(--brand-color--faint); + color: var(--primary-text-color); + padding: 15px 20px; + + .icon-button { + margin-right: 8px; + } +}