diff options
author | =Corey Hulen <corey@hulen.com> | 2015-12-08 13:02:33 -0800 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-12-08 13:02:33 -0800 |
commit | 69ecfe4cb1763b10f1690b543ee1828aed94aefa (patch) | |
tree | 53c70c2984b2e4144d3cc0e539ef1b52b8eb4552 /web/react/components/member_list_item.jsx | |
parent | 8b29404525f036633be6b25dc18c536d2aafee02 (diff) | |
parent | 90791dd98ea0f26439a13c1ec05a610514988b5c (diff) | |
download | chat-69ecfe4cb1763b10f1690b543ee1828aed94aefa.tar.gz chat-69ecfe4cb1763b10f1690b543ee1828aed94aefa.tar.bz2 chat-69ecfe4cb1763b10f1690b543ee1828aed94aefa.zip |
Fixing merge
Diffstat (limited to 'web/react/components/member_list_item.jsx')
-rw-r--r-- | web/react/components/member_list_item.jsx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/web/react/components/member_list_item.jsx b/web/react/components/member_list_item.jsx index f7f77f48a..a7273f280 100644 --- a/web/react/components/member_list_item.jsx +++ b/web/react/components/member_list_item.jsx @@ -78,17 +78,15 @@ export default class MemberListItem extends React.Component { href='#' className='dropdown-toggle theme' type='button' - id='channel_header_dropdown' data-toggle='dropdown' aria-expanded='true' > + <span className='fa fa-pencil'></span> <span className='text-capitalize'>{member.roles || 'Member'} </span> - <span className='caret'></span> </a> <ul className='dropdown-menu member-menu' role='menu' - aria-labelledby='channel_header_dropdown' > {makeAdminOption} {handleRemoveOption} @@ -96,7 +94,7 @@ export default class MemberListItem extends React.Component { </div> ); } else { - invite = <div className='member-role text-capitalize'>{member.roles || 'Member'}<span className='caret hidden'></span></div>; + invite = <div className='member-role text-capitalize'><span className='fa fa-pencil hidden'></span>{member.roles || 'Member'}</div>; } return ( |