Other UI Improvements
Этот коммит содержится в:
@@ -262,25 +262,27 @@ export default class CreateComment extends React.Component {
|
||||
id={this.props.rootId}
|
||||
className='post-create-body comment-create-body'
|
||||
>
|
||||
<Textbox
|
||||
onUserInput={this.handleUserInput}
|
||||
onKeyPress={this.commentMsgKeyPress}
|
||||
messageText={this.state.messageText}
|
||||
createMessage='Add a comment...'
|
||||
initialText=''
|
||||
id='reply_textbox'
|
||||
ref='textbox'
|
||||
/>
|
||||
<FileUpload
|
||||
ref='fileUpload'
|
||||
getFileCount={this.getFileCount}
|
||||
onUploadStart={this.handleUploadStart}
|
||||
onFileUpload={this.handleFileUploadComplete}
|
||||
onUploadError={this.handleUploadError}
|
||||
onTextDrop={this.handleTextDrop}
|
||||
postType='comment'
|
||||
channelId={this.props.channelId}
|
||||
/>
|
||||
<div className='post-body__cell'>
|
||||
<Textbox
|
||||
onUserInput={this.handleUserInput}
|
||||
onKeyPress={this.commentMsgKeyPress}
|
||||
messageText={this.state.messageText}
|
||||
createMessage='Add a comment...'
|
||||
initialText=''
|
||||
id='reply_textbox'
|
||||
ref='textbox'
|
||||
/>
|
||||
<FileUpload
|
||||
ref='fileUpload'
|
||||
getFileCount={this.getFileCount}
|
||||
onUploadStart={this.handleUploadStart}
|
||||
onFileUpload={this.handleFileUploadComplete}
|
||||
onUploadError={this.handleUploadError}
|
||||
onTextDrop={this.handleTextDrop}
|
||||
postType='comment'
|
||||
channelId={this.props.channelId}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<MsgTyping
|
||||
channelId={this.props.channelId}
|
||||
|
||||
@@ -32,11 +32,17 @@ export default class SettingItemMax extends React.Component {
|
||||
}
|
||||
|
||||
var inputs = this.props.inputs;
|
||||
var widthClass;
|
||||
if (this.props.width === 'full') {
|
||||
widthClass = 'col-sm-12';
|
||||
} else {
|
||||
widthClass = 'col-sm-9 col-sm-offset-3';
|
||||
}
|
||||
|
||||
return (
|
||||
<ul className='section-max form-horizontal'>
|
||||
<li className='col-sm-12 section-title'>{this.props.title}</li>
|
||||
<li className='col-sm-9 col-sm-offset-3'>
|
||||
<li className={widthClass}>
|
||||
<ul className='setting-list'>
|
||||
<li className='setting-list-item'>
|
||||
{inputs}
|
||||
@@ -69,5 +75,6 @@ SettingItemMax.propTypes = {
|
||||
extraInfo: React.PropTypes.element,
|
||||
updateSection: React.PropTypes.func,
|
||||
submit: React.PropTypes.func,
|
||||
title: React.PropTypes.string
|
||||
title: React.PropTypes.string,
|
||||
width: React.PropTypes.string
|
||||
};
|
||||
|
||||
@@ -149,7 +149,7 @@ export default class SignupUserComplete extends React.Component {
|
||||
// set up the email entry and hide it if an email was provided
|
||||
var yourEmailIs = '';
|
||||
if (this.state.user.email) {
|
||||
yourEmailIs = <span>Your email address is {this.state.user.email}. You'll use this address to sign in to {global.window.config.SiteName}.</span>;
|
||||
yourEmailIs = <span>Your email address is <strong>{this.state.user.email}</strong>. You'll use this address to sign in to {global.window.config.SiteName}.</span>;
|
||||
}
|
||||
|
||||
var emailContainerStyle = 'margin--extra';
|
||||
|
||||
@@ -246,9 +246,11 @@ export default class Textbox extends React.Component {
|
||||
if (e.scrollHeight - mod < 167) {
|
||||
$(e).css({height: 'auto', 'overflow-y': 'hidden'}).height(e.scrollHeight - mod);
|
||||
$(w).css({height: 'auto'}).height(e.scrollHeight + 2);
|
||||
$(w).closest('.post-body__cell').removeClass('scroll');
|
||||
} else {
|
||||
$(e).css({height: 'auto', 'overflow-y': 'scroll'}).height(167);
|
||||
$(w).css({height: 'auto'}).height(167);
|
||||
$(w).closest('.post-body__cell').addClass('scroll');
|
||||
}
|
||||
|
||||
if (prevHeight !== $(e).height() && this.props.onHeightChange) {
|
||||
|
||||
@@ -38,6 +38,7 @@ export default class UserSettingsIntegrationsTab extends React.Component {
|
||||
incomingHooksSection = (
|
||||
<SettingItemMax
|
||||
title='Incoming Webhooks'
|
||||
width = 'full'
|
||||
inputs={inputs}
|
||||
updateSection={function clearSection(e) {
|
||||
this.updateSection('');
|
||||
@@ -49,6 +50,7 @@ export default class UserSettingsIntegrationsTab extends React.Component {
|
||||
incomingHooksSection = (
|
||||
<SettingItemMin
|
||||
title='Incoming Webhooks'
|
||||
width = 'full'
|
||||
describe='Manage your incoming webhooks (Developer feature)'
|
||||
updateSection={function updateNameSection() {
|
||||
this.updateSection('incoming-hooks');
|
||||
|
||||
Ссылка в новой задаче
Block a user