Ui fixes (#4987)
* PLT-5090 - Adding overflow for usrename on popover * PLT-5089 - Updatng save button position * PLT-5146 - Removing anchor on teamname/username * Minor fixes for profile popover * Adjusting constants call for sidebar header
Этот коммит содержится в:
коммит произвёл
Joram Wilander
родитель
61771a0fc5
Коммит
1aa235b10d
@@ -185,34 +185,34 @@ export default class ProfilePopover extends React.Component {
|
|||||||
const fullname = Utils.getFullName(this.props.user);
|
const fullname = Utils.getFullName(this.props.user);
|
||||||
if (fullname) {
|
if (fullname) {
|
||||||
dataContent.push(
|
dataContent.push(
|
||||||
<div
|
<OverlayTrigger
|
||||||
data-toggle='tooltip'
|
delayShow={Constants.WEBRTC_TIME_DELAY}
|
||||||
title={fullname}
|
placement='top'
|
||||||
key='user-popover-fullname'
|
overlay={<Tooltip id='fullNameTooltip'>{fullname}</Tooltip>}
|
||||||
>
|
>
|
||||||
<p
|
<div
|
||||||
className='text-nowrap'
|
className='overflow--ellipsis text-nowrap padding-bottom'
|
||||||
>
|
>
|
||||||
{fullname}
|
{fullname}
|
||||||
</p>
|
</div>
|
||||||
</div>
|
</OverlayTrigger>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.props.user.position) {
|
if (this.props.user.position) {
|
||||||
const position = this.props.user.position.substring(0, Constants.MAX_POSITION_LENGTH);
|
const position = this.props.user.position.substring(0, Constants.MAX_POSITION_LENGTH);
|
||||||
dataContent.push(
|
dataContent.push(
|
||||||
<div
|
<OverlayTrigger
|
||||||
data-toggle='tooltip'
|
delayShow={Constants.WEBRTC_TIME_DELAY}
|
||||||
title={position}
|
placement='top'
|
||||||
key='user-popover-position'
|
overlay={<Tooltip id='positionTooltip'>{position}</Tooltip>}
|
||||||
>
|
>
|
||||||
<p
|
<div
|
||||||
className='text-nowrap'
|
className='overflow--ellipsis text-nowrap padding-bottom'
|
||||||
>
|
>
|
||||||
{position}
|
{position}
|
||||||
</p>
|
</div>
|
||||||
</div>
|
</OverlayTrigger>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ export default class SettingItemMax extends React.Component {
|
|||||||
submit = (
|
submit = (
|
||||||
<input
|
<input
|
||||||
type='submit'
|
type='submit'
|
||||||
className='btn btn-sm btn-primary'
|
className='btn btn-sm btn-primary pull-right'
|
||||||
href='#'
|
href='#'
|
||||||
onClick={this.props.submit}
|
onClick={this.props.submit}
|
||||||
value={Utils.localizeMessage('setting_item_max.save', 'Save')}
|
value={Utils.localizeMessage('setting_item_max.save', 'Save')}
|
||||||
@@ -88,7 +88,7 @@ export default class SettingItemMax extends React.Component {
|
|||||||
{clientError}
|
{clientError}
|
||||||
{submit}
|
{submit}
|
||||||
<a
|
<a
|
||||||
className='btn btn-sm theme'
|
className='btn btn-sm pull-right'
|
||||||
href='#'
|
href='#'
|
||||||
onClick={this.props.updateSection}
|
onClick={this.props.updateSection}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ export default class SettingPicture extends React.Component {
|
|||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
var confirmButtonClass = 'btn btn-sm';
|
var confirmButtonClass = 'btn btn-sm pull-right';
|
||||||
if (this.props.submitActive) {
|
if (this.props.submitActive) {
|
||||||
confirmButtonClass += ' btn-primary';
|
confirmButtonClass += ' btn-primary';
|
||||||
} else {
|
} else {
|
||||||
@@ -132,7 +132,7 @@ export default class SettingPicture extends React.Component {
|
|||||||
</span>
|
</span>
|
||||||
{confirmButton}
|
{confirmButton}
|
||||||
<a
|
<a
|
||||||
className='btn btn-sm theme'
|
className='btn btn-sm theme pull-right'
|
||||||
href='#'
|
href='#'
|
||||||
onClick={self.props.updateSection}
|
onClick={self.props.updateSection}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import * as Utils from 'utils/utils.jsx';
|
|||||||
import SidebarHeaderDropdown from './sidebar_header_dropdown.jsx';
|
import SidebarHeaderDropdown from './sidebar_header_dropdown.jsx';
|
||||||
import {Tooltip, OverlayTrigger} from 'react-bootstrap';
|
import {Tooltip, OverlayTrigger} from 'react-bootstrap';
|
||||||
|
|
||||||
import {Preferences, TutorialSteps} from 'utils/constants.jsx';
|
import {Preferences, TutorialSteps, OVERLAY_TIME_DELAY} from 'utils/constants.jsx';
|
||||||
import {createMenuTip} from 'components/tutorial/tutorial_tip.jsx';
|
import {createMenuTip} from 'components/tutorial/tutorial_tip.jsx';
|
||||||
|
|
||||||
export default class SidebarHeader extends React.Component {
|
export default class SidebarHeader extends React.Component {
|
||||||
@@ -78,7 +78,7 @@ export default class SidebarHeader extends React.Component {
|
|||||||
teamNameWithToolTip = (
|
teamNameWithToolTip = (
|
||||||
<OverlayTrigger
|
<OverlayTrigger
|
||||||
trigger={['hover', 'focus']}
|
trigger={['hover', 'focus']}
|
||||||
delayShow={1000}
|
delayShow={OVERLAY_TIME_DELAY}
|
||||||
placement='bottom'
|
placement='bottom'
|
||||||
overlay={<Tooltip id='team-name__tooltip'>{this.props.teamDescription}</Tooltip>}
|
overlay={<Tooltip id='team-name__tooltip'>{this.props.teamDescription}</Tooltip>}
|
||||||
ref='descriptionOverlay'
|
ref='descriptionOverlay'
|
||||||
@@ -91,16 +91,13 @@ export default class SidebarHeader extends React.Component {
|
|||||||
return (
|
return (
|
||||||
<div className='team__header theme'>
|
<div className='team__header theme'>
|
||||||
{tutorialTip}
|
{tutorialTip}
|
||||||
<a
|
<div>
|
||||||
href='#'
|
|
||||||
onClick={this.toggleDropdown}
|
|
||||||
>
|
|
||||||
{profilePicture}
|
{profilePicture}
|
||||||
<div className='header__info'>
|
<div className='header__info'>
|
||||||
<div className='user__name'>{'@' + me.username}</div>
|
<div className='user__name'>{'@' + me.username}</div>
|
||||||
{teamNameWithToolTip}
|
{teamNameWithToolTip}
|
||||||
</div>
|
</div>
|
||||||
</a>
|
</div>
|
||||||
<SidebarHeaderDropdown
|
<SidebarHeaderDropdown
|
||||||
ref='dropdown'
|
ref='dropdown'
|
||||||
teamType={this.props.teamType}
|
teamType={this.props.teamType}
|
||||||
|
|||||||
@@ -26,6 +26,11 @@ body {
|
|||||||
word-break: break-all;
|
word-break: break-all;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.overflow--ellipsis {
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
|
||||||
.fa {
|
.fa {
|
||||||
&.fa-margin--left {
|
&.fa-margin--left {
|
||||||
margin-left: 2px;
|
margin-left: 2px;
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user