* 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
Этот коммит содержится в:
Asaad Mahmood
2017-08-17 19:07:34 +05:00
коммит произвёл Harrison Healey
родитель 22459ee17a
Коммит d41f1695e9
6 изменённых файлов: 78 добавлений и 38 удалений

Просмотреть файл

@@ -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}