Ui improvements (#6651)
* PLT-6691 - Centering emoji in post view * PLT-6737 - FIxing on hover style for heade icons * PLT-6768 - Fixing error on profile picture * PLT-6792 - Fixing link preview image not resizing * PLT-6793 - User popover position on mobile
Этот коммит содержится в:
коммит произвёл
Corey Hulen
родитель
528f2dc6c3
Коммит
94fdba9a31
@@ -43,6 +43,16 @@ export default class FormError extends React.Component {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (this.props.type === 'modal') {
|
||||
return (
|
||||
<div className='form-group'>
|
||||
<label className='col-sm-12 has-error'>
|
||||
{message}
|
||||
</label>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
if (this.props.type === 'backstage') {
|
||||
return (
|
||||
<div className='pull-left has-error'>
|
||||
|
||||
@@ -102,14 +102,14 @@ export default class SettingPicture extends Component {
|
||||
}
|
||||
|
||||
return (
|
||||
<ul className='section-max'>
|
||||
<ul className='section-max form-horizontal'>
|
||||
<li className='col-xs-12 section-title'>{this.props.title}</li>
|
||||
<li className='col-xs-offset-3 col-xs-8'>
|
||||
<ul className='setting-list'>
|
||||
<li className='setting-list-item'>
|
||||
{img}
|
||||
</li>
|
||||
<li className='setting-list-item'>
|
||||
<li className='setting-list-item padding-top x2'>
|
||||
<FormattedMessage
|
||||
id='setting_picture.help'
|
||||
defaultMessage='Upload a profile picture in BMP, JPG, JPEG or PNG format, at least {width}px in width and {height}px height.'
|
||||
@@ -120,7 +120,11 @@ export default class SettingPicture extends Component {
|
||||
/>
|
||||
</li>
|
||||
<li className='setting-list-item'>
|
||||
<FormError errors={[this.props.clientError, this.props.serverError]}/>
|
||||
<hr/>
|
||||
<FormError
|
||||
errors={[this.props.clientError, this.props.serverError]}
|
||||
type={'modal'}
|
||||
/>
|
||||
<span className='btn btn-sm btn-primary btn-file sel-btn'>
|
||||
<FormattedMessage
|
||||
id='setting_picture.select'
|
||||
|
||||
@@ -56,6 +56,11 @@ export default class UserProfile extends React.Component {
|
||||
render() {
|
||||
let name = '...';
|
||||
let profileImg = '';
|
||||
let popoverPosition = 'right';
|
||||
if (Utils.isMobile()) {
|
||||
popoverPosition = 'bottom';
|
||||
}
|
||||
|
||||
if (this.props.user) {
|
||||
name = Utils.displayUsername(this.props.user.id);
|
||||
profileImg = Client.getUsersRoute() + '/' + this.props.user.id + '/image?time=' + this.props.user.last_picture_update;
|
||||
@@ -73,7 +78,7 @@ export default class UserProfile extends React.Component {
|
||||
<OverlayTrigger
|
||||
ref='overlay'
|
||||
trigger='click'
|
||||
placement='right'
|
||||
placement={popoverPosition}
|
||||
rootClose={true}
|
||||
overlay={
|
||||
<ProfilePopover
|
||||
|
||||
Ссылка в новой задаче
Block a user