PrimaryNavigation, ThumbNavigation: move Search to after Home
This commit is contained in:
parent
1edfb0206a
commit
897f65cf72
2 changed files with 18 additions and 18 deletions
|
@ -63,6 +63,14 @@ class PrimaryNavigation extends React.PureComponent {
|
||||||
<FormattedMessage id='tabs_bar.home' defaultMessage='Home' />
|
<FormattedMessage id='tabs_bar.home' defaultMessage='Home' />
|
||||||
</NavLink>
|
</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 && (
|
{account && (
|
||||||
<NavLink key='notifications' className='btn grouped' to='/notifications' data-preview-title-id='column.notifications'>
|
<NavLink key='notifications' className='btn grouped' to='/notifications' data-preview-title-id='column.notifications'>
|
||||||
<IconWithCounter
|
<IconWithCounter
|
||||||
|
@ -98,14 +106,6 @@ 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)) && (
|
{(account && isStaff(account)) && (
|
||||||
<NavLink key='dashboard' className='btn grouped' to='/admin' data-preview-title-id='tabs_bar.dashboard'>
|
<NavLink key='dashboard' className='btn grouped' to='/admin' data-preview-title-id='tabs_bar.dashboard'>
|
||||||
<IconWithCounter
|
<IconWithCounter
|
||||||
|
|
|
@ -56,6 +56,16 @@ class ThumbNavigation extends React.PureComponent {
|
||||||
</span>
|
</span>
|
||||||
</NavLink>
|
</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 && (
|
{account && (
|
||||||
<NavLink to='/notifications' className='thumb-navigation__link'>
|
<NavLink to='/notifications' className='thumb-navigation__link'>
|
||||||
<IconWithCounter
|
<IconWithCounter
|
||||||
|
@ -97,16 +107,6 @@ 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)) && (
|
{(account && isStaff(account)) && (
|
||||||
<NavLink key='dashboard' to='/admin' className='thumb-navigation__link'>
|
<NavLink key='dashboard' to='/admin' className='thumb-navigation__link'>
|
||||||
<IconWithCounter
|
<IconWithCounter
|
||||||
|
|
Loading…
Reference in a new issue