mirror of
https://github.com/mattermost/mattermost.git
synced 2025-02-25 18:55:24 -06:00
PLT-2519 - Fixing users page
This commit is contained in:
@@ -165,11 +165,9 @@ export default class UserList extends React.Component {
|
||||
className='form-horizontal'
|
||||
role='form'
|
||||
>
|
||||
<table className='more-modal__list member-list-holder'>
|
||||
<tbody>
|
||||
{memberList}
|
||||
</tbody>
|
||||
</table>
|
||||
<div className='more-modal__list member-list-holder'>
|
||||
{memberList}
|
||||
</div>
|
||||
</form>
|
||||
<ResetPasswordModal
|
||||
user={this.state.user}
|
||||
|
||||
@@ -365,16 +365,18 @@ export default class UserItem extends React.Component {
|
||||
}
|
||||
|
||||
return (
|
||||
<tr>
|
||||
<td className='more-modal__row'>
|
||||
<img
|
||||
className='more-modal__image pull-left'
|
||||
src={`/api/v1/users/${user.id}/image?time=${user.update_at}`}
|
||||
height='36'
|
||||
width='36'
|
||||
/>
|
||||
<span className='more-modal__name'>{Utils.getDisplayName(user)}</span>
|
||||
<span className='more-modal__description'>{email}</span>
|
||||
<div className='more-modal__row'>
|
||||
<img
|
||||
className='more-modal__image pull-left'
|
||||
src={`/api/v1/users/${user.id}/image?time=${user.update_at}`}
|
||||
height='36'
|
||||
width='36'
|
||||
/>
|
||||
<div className='more-modal__details'>
|
||||
<div className='more-modal__name'>{Utils.getDisplayName(user)}</div>
|
||||
<div className='more-modal__description'>{email}</div>
|
||||
</div>
|
||||
<div className='more-modal__actions'>
|
||||
<div className='dropdown member-drop'>
|
||||
<a
|
||||
href='#'
|
||||
@@ -409,10 +411,10 @@ export default class UserItem extends React.Component {
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
{makeDemoteModal}
|
||||
{serverError}
|
||||
</td>
|
||||
</tr>
|
||||
</div>
|
||||
{makeDemoteModal}
|
||||
{serverError}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -726,7 +726,7 @@
|
||||
top: 0;
|
||||
z-index: 0;
|
||||
}
|
||||
|
||||
|
||||
&.move--right {
|
||||
@include translate3d(290px, 0, 0);
|
||||
|
||||
@@ -883,8 +883,9 @@
|
||||
.backstage-list__item {
|
||||
display: block;
|
||||
|
||||
.item-actions,
|
||||
.actions {
|
||||
margin-top: 10px;
|
||||
margin-top: 15px;
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -357,11 +357,15 @@
|
||||
}
|
||||
|
||||
.member-list-holder {
|
||||
.member-role,
|
||||
.member-drop {
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
top: 8px;
|
||||
background: $white;
|
||||
margin-bottom: 4em;
|
||||
overflow: visible;
|
||||
padding: 5px 0;
|
||||
|
||||
.more-modal__row {
|
||||
&:last-child {
|
||||
border: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -199,27 +199,27 @@ body {
|
||||
|
||||
.item-details__row + .item-details__row {
|
||||
@include clearfix;
|
||||
margin-top: 10px;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
.item-details__name {
|
||||
font-weight: 600;
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
.item-details__type {
|
||||
margin-left: 6px;
|
||||
}
|
||||
|
||||
.item-details__description {
|
||||
color: $dark-gray;
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
.item-details__description,
|
||||
.item-details__creation {
|
||||
color: $dark-gray;
|
||||
margin-bottom: 1em;
|
||||
display: inline-block;
|
||||
margin-top: 10px;
|
||||
vertical-align: top;
|
||||
|
||||
&:empty {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
.item-actions {
|
||||
|
||||
Reference in New Issue
Block a user