kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
Revert "Swap positions of Search and Messages/Chats in navigation"
This reverts commit 66f2aa4e84
.
merge-requests/784/head
rodzic
66f2aa4e84
commit
4e6a6278ac
|
@ -77,14 +77,6 @@ class PrimaryNavigation extends React.PureComponent {
|
|||
</NavLink>
|
||||
)}
|
||||
|
||||
<NavLink key='search' className='btn grouped' to='/search'>
|
||||
<Icon
|
||||
src={require('@tabler/icons/icons/search.svg')}
|
||||
className={classNames('primary-navigation__icon', { 'svg-icon--active': location.pathname === '/search' })}
|
||||
/>
|
||||
<FormattedMessage id='navigation.search' defaultMessage='Search' />
|
||||
</NavLink>
|
||||
|
||||
{account && (
|
||||
features.chats ? (
|
||||
<NavLink key='chats' className='btn grouped' to='/chats' data-preview-title-id='column.chats'>
|
||||
|
@ -106,6 +98,14 @@ class PrimaryNavigation extends React.PureComponent {
|
|||
)
|
||||
)}
|
||||
|
||||
<NavLink key='search' className='btn grouped' to='/search'>
|
||||
<Icon
|
||||
src={require('@tabler/icons/icons/search.svg')}
|
||||
className={classNames('primary-navigation__icon', { 'svg-icon--active': location.pathname === '/search' })}
|
||||
/>
|
||||
<FormattedMessage id='navigation.search' defaultMessage='Search' />
|
||||
</NavLink>
|
||||
|
||||
{(account && isStaff(account)) && (
|
||||
<NavLink key='dashboard' className='btn grouped' to='/admin' data-preview-title-id='tabs_bar.dashboard'>
|
||||
<IconWithCounter
|
||||
|
|
|
@ -72,16 +72,6 @@ class ThumbNavigation extends React.PureComponent {
|
|||
</NavLink>
|
||||
)}
|
||||
|
||||
<NavLink to='/search' className='thumb-navigation__link'>
|
||||
<Icon
|
||||
src={require('@tabler/icons/icons/search.svg')}
|
||||
className={classNames({ 'svg-icon--active': location.pathname === '/search' })}
|
||||
/>
|
||||
<span>
|
||||
<FormattedMessage id='navigation.search' defaultMessage='Search' />
|
||||
</span>
|
||||
</NavLink>
|
||||
|
||||
{account && (
|
||||
features.chats ? (
|
||||
<NavLink to='/chats' className='thumb-navigation__link'>
|
||||
|
@ -107,6 +97,16 @@ class ThumbNavigation extends React.PureComponent {
|
|||
)
|
||||
)}
|
||||
|
||||
<NavLink to='/search' className='thumb-navigation__link'>
|
||||
<Icon
|
||||
src={require('@tabler/icons/icons/search.svg')}
|
||||
className={classNames({ 'svg-icon--active': location.pathname === '/search' })}
|
||||
/>
|
||||
<span>
|
||||
<FormattedMessage id='navigation.search' defaultMessage='Search' />
|
||||
</span>
|
||||
</NavLink>
|
||||
|
||||
{(account && isStaff(account)) && (
|
||||
<NavLink key='dashboard' to='/admin' className='thumb-navigation__link'>
|
||||
<IconWithCounter
|
||||
|
|
Ładowanie…
Reference in New Issue