Commit 9768d581 authored by Asaad Mahmood's avatar Asaad Mahmood Committed by Harrison Healey

MM-13518 - Updating profile popover position (#2213)

* MM-13518 - Updating profile popover position

* MM-13518 - Updating profile popover css
parent ca649c1a
......@@ -213,7 +213,7 @@ class ProfilePopover extends React.PureComponent {
key='user-popover-fullname'
>
<div
className='overflow--ellipsis text-nowrap padding-top'
className='overflow--ellipsis text-nowrap'
>
<strong>{fullname}</strong>
</div>
......
......@@ -56,6 +56,11 @@ export default class UserProfile extends React.Component {
render() {
let name = '...';
let profileImg = '';
let placement = 'right';
if (this.props.isRHS && !Utils.isMobile()) {
placement = 'left';
}
if (this.props.user && this.props.user.id) {
name = Utils.getDisplayNameByUserId(this.props.user.id);
......@@ -74,7 +79,7 @@ export default class UserProfile extends React.Component {
<OverlayTrigger
ref='overlay'
trigger='click'
placement='right'
placement={placement}
rootClose={true}
overlay={
<Pluggable>
......
......@@ -41,6 +41,11 @@
overflow: hidden;
padding: 8px 10px;
text-overflow: ellipsis;
> span {
display: flex;
justify-content: space-between;
}
}
hr {
......@@ -114,8 +119,6 @@
}
.user-popover__role {
display: inline-block;
float: right;
padding: 3px 5px;
margin-left: 10px;
background-color: $gray;
......
......@@ -676,6 +676,7 @@ export function applyTheme(theme) {
if (theme.centerChannelColor) {
changeCss('.app__body .bg-text-200', 'background:' + changeOpacity(theme.centerChannelColor, 0.2));
changeCss('.app__body .user-popover__role', 'background:' + changeOpacity(theme.centerChannelColor, 0.3));
changeCss('.app__body .svg-text-color', 'fill:' + theme.centerChannelColor);
changeCss('.app__body .mentions__name .status.status--group, .app__body .multi-select__note', 'background:' + changeOpacity(theme.centerChannelColor, 0.12));
changeCss('.app__body .modal-tabs .nav-tabs > li, .app__body .form-control, .app__body .system-notice, .app__body .file-view--single .file__image .image-loaded, .app__body .post .dropdown .dropdown-menu button, .app__body .member-list__popover .more-modal__body, .app__body .alert.alert-transparent, .app__body .channel-header .channel-header__icon, .app__body .search-bar__container .search__form, .app__body .table > thead > tr > th, .app__body .table > tbody > tr > td', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.12));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment