diff options
author | Asaad Mahmood <asaadmahmood@users.noreply.github.com> | 2017-08-17 19:07:34 +0500 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-08-17 10:07:34 -0400 |
commit | d41f1695e99a81808f5dc1fbe7820062947b5291 (patch) | |
tree | 7980dab037803100715233fbe3c664819252065d /webapp/components | |
parent | 22459ee17a3ba0b4487f975b6ebe630cab2d9feb (diff) | |
download | chat-d41f1695e99a81808f5dc1fbe7820062947b5291.tar.gz chat-d41f1695e99a81808f5dc1fbe7820062947b5291.tar.bz2 chat-d41f1695e99a81808f5dc1fbe7820062947b5291.zip |
Minor UI improvements (#7137)
* PLT-7303 - Fixing manage members button
* Revert "PLT-7303 - Fixing manage members button"
This reverts commit 7dcb68a8e333a2c95444d417ed9a244c9c30aa99.
* PLT-7303 - Redesigning channel members popover
* Updating font size and positioning
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/popover_list_members/popover_list_members.jsx | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/webapp/components/popover_list_members/popover_list_members.jsx b/webapp/components/popover_list_members/popover_list_members.jsx index 35d0eab6b..eca0fa5c2 100644 --- a/webapp/components/popover_list_members/popover_list_members.jsx +++ b/webapp/components/popover_list_members/popover_list_members.jsx @@ -52,7 +52,7 @@ export default class PopoverListMembers extends React.Component { } componentDidUpdate() { - $('.member-list__popover .popover-content').perfectScrollbar(); + $('.member-list__popover .popover-content .more-modal__body').perfectScrollbar(); } handleShowDirectChannel(teammate, e) { @@ -86,6 +86,7 @@ export default class PopoverListMembers extends React.Component { } render() { + let popoverButton; const popoverHtml = []; const members = this.props.members; const teamMembers = UserStore.getProfilesUsernameMap(); @@ -124,8 +125,8 @@ export default class PopoverListMembers extends React.Component { > <ProfilePicture src={Client4.getProfilePictureUrl(m.id, m.last_picture_update)} - width='32' - height='32' + width='40' + height='40' /> <div className='more-modal__details'> <div @@ -168,13 +169,13 @@ export default class PopoverListMembers extends React.Component { ); } - popoverHtml.push( + popoverButton = ( <div - className='more-modal__row more-modal__row--button' + className='more-modal__button' key={'popover-member-more'} > <button - className='btn btn-primary' + className='btn btn-link' onClick={this.showMembersModal} > {membersName} @@ -193,7 +194,7 @@ export default class PopoverListMembers extends React.Component { const title = ( <FormattedMessage id='members_popover.title' - defaultMessage='Members' + defaultMessage='Channel Members' /> ); @@ -275,14 +276,12 @@ export default class PopoverListMembers extends React.Component { id='member-list-popover' > <div className='more-modal__header'> - <span - className='icon icon__members' - dangerouslySetInnerHTML={{__html: membersIcon}} - aria-hidden='true' - /> {title} </div> - <div className='more-modal__list'>{popoverHtml}</div> + <div className='more-modal__body'> + <div className='more-modal__list'>{popoverHtml}</div> + </div> + {popoverButton} </Popover> </Overlay> {channelMembersModal} |