diff options
-rw-r--r-- | webapp/components/file_upload.jsx | 20 | ||||
-rw-r--r-- | webapp/sass/responsive/_mobile.scss | 9 |
2 files changed, 14 insertions, 15 deletions
diff --git a/webapp/components/file_upload.jsx b/webapp/components/file_upload.jsx index d97b1ed3b..a0e7f5296 100644 --- a/webapp/components/file_upload.jsx +++ b/webapp/components/file_upload.jsx @@ -350,11 +350,16 @@ class FileUpload extends React.Component { const channelId = this.props.channelId || ChannelStore.getCurrentId(); const uploadsRemaining = Constants.MAX_UPLOAD_FILES - this.props.getFileCount(channelId); - const emojiSpan = (<span - className={'fa fa-smile-o icon--emoji-picker emoji-' + this.props.navBarName} - onClick={this.emojiClick} - />); - const filestyle = {visibility: 'hidden'}; + + let emojiSpan; + if (this.props.emojiEnabled) { + emojiSpan = ( + <span + className={'fa fa-smile-o icon--emoji-picker emoji-' + this.props.navBarName} + onClick={this.emojiClick} + /> + ); + } return ( <span @@ -363,20 +368,19 @@ class FileUpload extends React.Component { > <div className='icon--attachment'> <span + className='icon' dangerouslySetInnerHTML={{__html: Constants.ATTACHMENT_ICON_SVG}} - onClick={() => this.refs.fileInput.click()} /> <input ref='fileInput' type='file' - style={filestyle} onChange={this.handleChange} onClick={uploadsRemaining > 0 ? this.props.onClick : this.handleMaxUploadReached} multiple={multiple} accept={accept} /> </div> - {this.props.emojiEnabled ? emojiSpan : ''} + {emojiSpan} </span> ); } diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss index e47ba26aa..96fb86843 100644 --- a/webapp/sass/responsive/_mobile.scss +++ b/webapp/sass/responsive/_mobile.scss @@ -33,14 +33,9 @@ .msg-typing { display: none; } - } - .post-create__container{ - .post-create-body { - .icon__postcontent_picker { - display:none; - top: -7px; - } + .icon--emoji-picker { + display: none; } } |