Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Change featured hashtags to be displayed in navigation panel (#19382)

Browse source
This commit is contained in:
Eugen Rochko 2022-10-19 11:30:59 +02:00 • committed by GitHub
parent 1b83040bd4
commit aefa9253d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 161 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/javascript/mastodon/features/ui/components/navigation_panel.js
View file

@ -3,13 +3,13 @@ import PropTypes from 'prop-types';
import { defineMessages, injectIntl } from 'react-intl';
import { Link } from 'react-router-dom';
import Logo from 'mastodon/components/logo';
import TrendsContainer from 'mastodon/features/getting_started/containers/trends_container';
import { showTrends, timelinePreview } from 'mastodon/initial_state';
import { timelinePreview } from 'mastodon/initial_state';
import ColumnLink from './column_link';
import FollowRequestsColumnLink from './follow_requests_column_link';
import ListPanel from './list_panel';
import NotificationsCounterIcon from './notifications_counter_icon';
import SignInBanner from './sign_in_banner';
import NavigationPortal from 'mastodon/components/navigation_portal';
const messages = defineMessages({
home: { id: 'tabs_bar.home', defaultMessage: 'Home' },
@ -93,12 +93,7 @@ class NavigationPanel extends React.Component {
<ColumnLink transparent to='/about' icon='ellipsis-h' text={intl.formatMessage(messages.about)} />
</div>
{showTrends && (
<React.Fragment>
<div className='flex-spacer' />
<TrendsContainer />
</React.Fragment>
)}
<NavigationPortal />
</div>
);
}