diff options
| author | Asaad Mahmood <asaadmahmood@users.noreply.github.com> | 2017-09-05 22:43:14 +0500 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-09-05 13:43:14 -0400 |
| commit | e089a88f18d400a3dd984b1af5559c09623dfc05 (patch) | |
| tree | a5f5278c8751f7dd87d6a1defcaa44b74df4e01d /webapp | |
| parent | c4e32060bef6ad2c6a2c8dfb8cdb8ad34d0f302e (diff) | |
| download | chat-e089a88f18d400a3dd984b1af5559c09623dfc05.tar.gz chat-e089a88f18d400a3dd984b1af5559c09623dfc05.tar.bz2 chat-e089a88f18d400a3dd984b1af5559c09623dfc05.zip | |
Minor bug fixes (#7357)
* PLT-7514 - Adjusting help text
* PLT-7499 - Fixing word wrapping in delete modal
* PLT-7523 - Fixing autocomplete in header modal
Diffstat (limited to 'webapp')
4 files changed, 7 insertions, 7 deletions
diff --git a/webapp/components/edit_channel_header_modal.jsx b/webapp/components/edit_channel_header_modal.jsx index b993fb93c..36ea06fce 100644 --- a/webapp/components/edit_channel_header_modal.jsx +++ b/webapp/components/edit_channel_header_modal.jsx @@ -168,8 +168,8 @@ class EditChannelHeaderModal extends React.Component { {headerTitle} </Modal.Title> </Modal.Header> - <Modal.Body> - <div className='edit-modal-body'> + <Modal.Body bsClass='modal-body edit-modal-body'> + <div> <p> <FormattedMessage id='edit_channel_header_modal.description' diff --git a/webapp/components/user_settings/user_settings_security/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security/user_settings_security.jsx index ff4eb7ecb..cbf3814bd 100644 --- a/webapp/components/user_settings/user_settings_security/user_settings_security.jsx +++ b/webapp/components/user_settings/user_settings_security/user_settings_security.jsx @@ -1066,7 +1066,7 @@ export default class SecurityTab extends React.Component { /> ), confirmMessage: ( - <div className='alert alert-danger word-break--all'> + <div className='alert alert-danger'> <FormattedHTMLMessage id='user.settings.tokens.confirmDeleteMessage' defaultMessage='Any integrations using this token will no longer be able to access the Mattermost API. You cannot undo this action. <br /><br />Are you sure want to delete the {description} token?' diff --git a/webapp/sass/responsive/_desktop.scss b/webapp/sass/responsive/_desktop.scss index fdc318457..3c467cf10 100644 --- a/webapp/sass/responsive/_desktop.scss +++ b/webapp/sass/responsive/_desktop.scss @@ -54,10 +54,6 @@ } } - .help__format-text { - display: none; - } - .inner-wrap { &.move--left, &.webrtc--show { diff --git a/webapp/sass/responsive/_tablet.scss b/webapp/sass/responsive/_tablet.scss index 967d6231d..092b8c226 100644 --- a/webapp/sass/responsive/_tablet.scss +++ b/webapp/sass/responsive/_tablet.scss @@ -8,6 +8,10 @@ } } + .help__format-text { + display: none; + } + .post-right__scroll { .post-create__container { .post-create-body { |