diff options
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/navbar.jsx | 1 | ||||
-rw-r--r-- | webapp/components/select_team/select_team.jsx | 4 | ||||
-rw-r--r-- | webapp/components/sidebar_right_menu.jsx | 27 |
3 files changed, 18 insertions, 14 deletions
diff --git a/webapp/components/navbar.jsx b/webapp/components/navbar.jsx index d55c2723b..72066780e 100644 --- a/webapp/components/navbar.jsx +++ b/webapp/components/navbar.jsx @@ -671,6 +671,7 @@ export default class Navbar extends React.Component { show={this.state.showMembersModal} onModalDismissed={() => this.setState({showMembersModal: false})} channel={channel} + isAdmin={isAdmin} /> ); diff --git a/webapp/components/select_team/select_team.jsx b/webapp/components/select_team/select_team.jsx index 58bc107fe..084ff64b2 100644 --- a/webapp/components/select_team/select_team.jsx +++ b/webapp/components/select_team/select_team.jsx @@ -72,7 +72,7 @@ export default class SelectTeam extends React.Component { > <span className='signup-team-dir__name'>{team.display_name}</span> <span - className='fa fa-angle-right right signup-team-dir__arrow' + className='fa fa-angle-right right signup-team__icon' aria-hidden='true' /> </Link> @@ -96,7 +96,7 @@ export default class SelectTeam extends React.Component { > <span className='signup-team-dir__name'>{openTeam.display_name}</span> <span - className='fa fa-angle-right right signup-team-dir__arrow' + className='fa fa-angle-right right signup-team__icon' aria-hidden='true' /> </Link> diff --git a/webapp/components/sidebar_right_menu.jsx b/webapp/components/sidebar_right_menu.jsx index 6f6a32a5e..757a919c3 100644 --- a/webapp/components/sidebar_right_menu.jsx +++ b/webapp/components/sidebar_right_menu.jsx @@ -389,6 +389,7 @@ export default class SidebarRightMenu extends React.Component { /> </a> </li> + <li className='divider'/> <li> <a href='#' @@ -401,9 +402,10 @@ export default class SidebarRightMenu extends React.Component { /> </a> </li> - {teamSettingsLink} {inviteLink} {teamLink} + <li className='divider'/> + {teamSettingsLink} {manageLink} {consoleLink} <li> @@ -416,34 +418,35 @@ export default class SidebarRightMenu extends React.Component { </Link> </li> <li className='divider'/> + {helpLink} + {reportLink} <li> <a href='#' - onClick={GlobalActions.emitUserLoggedOutEvent} + onClick={this.handleAboutModal} > - <i className='icon fa fa-sign-out'/> + <i className='icon fa fa-info'/> <FormattedMessage - id='sidebar_right_menu.logout' - defaultMessage='Logout' + id='navbar_dropdown.about' + defaultMessage='About Mattermost' /> </a> </li> <li className='divider'/> - {helpLink} - {reportLink} + {nativeAppLink} + <li className='divider'/> <li> <a href='#' - onClick={this.handleAboutModal} + onClick={GlobalActions.emitUserLoggedOutEvent} > - <i className='icon fa fa-info'/> + <i className='icon fa fa-sign-out'/> <FormattedMessage - id='navbar_dropdown.about' - defaultMessage='About Mattermost' + id='sidebar_right_menu.logout' + defaultMessage='Logout' /> </a> </li> - {nativeAppLink} </ul> </div> <UserSettingsModal |