summaryrefslogtreecommitdiffstats
path: root/webapp/components/sidebar_right_menu.jsx
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmood@users.noreply.github.com>2016-09-26 20:21:37 +0500
committerChristopher Speller <crspeller@gmail.com>2016-09-26 11:21:37 -0400
commitdff985a92402319c16ad599e635b367fb123d60b (patch)
tree60f6dfe3ae161be59be3bfdd175f665cef9d47d4 /webapp/components/sidebar_right_menu.jsx
parentb39d903f6398ca78d7dcd7b1883e9368614f15f0 (diff)
downloadchat-dff985a92402319c16ad599e635b367fb123d60b.tar.gz
chat-dff985a92402319c16ad599e635b367fb123d60b.tar.bz2
chat-dff985a92402319c16ad599e635b367fb123d60b.zip
Multiple UI Improvements (#4069)
Minor contast fix for file uploading text. Updating icon markup Fixing icon for mentions Removing irrelevant characters Updating closing tag for mentions icon
Diffstat (limited to 'webapp/components/sidebar_right_menu.jsx')
-rw-r--r--webapp/components/sidebar_right_menu.jsx27
1 files changed, 15 insertions, 12 deletions
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