diff options
Diffstat (limited to 'webapp/components')
| -rw-r--r-- | webapp/components/admin_console/admin_sidebar.jsx | 8 | ||||
| -rw-r--r-- | webapp/components/user_settings/user_settings_security/user_settings_security.jsx | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx index f417cfe56..97b63e9c6 100644 --- a/webapp/components/admin_console/admin_sidebar.jsx +++ b/webapp/components/admin_console/admin_sidebar.jsx @@ -29,13 +29,17 @@ export default class AdminSidebar extends React.Component { this.updateTitle(); if (!Utils.isMobile()) { - $('.admin-sidebar .nav-pills__container').perfectScrollbar(); + $('.admin-sidebar .nav-pills__container').perfectScrollbar({ + suppressScrollX: true + }); } } componentDidUpdate() { if (!Utils.isMobile()) { - $('.admin-sidebar .nav-pills__container').perfectScrollbar(); + $('.admin-sidebar .nav-pills__container').perfectScrollbar({ + suppressScrollX: true + }); } } 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 cbf3814bd..ff4eb7ecb 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'> + <div className='alert alert-danger word-break--all'> <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?' |