diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-03-23 16:02:36 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-03-23 16:02:36 -0400 |
| commit | 6ccef5caf5ff33b765bd488d4f609c4426c7bbf0 (patch) | |
| tree | a3dc95120cd5113917bb4ec5acab716d645d4d3a /webapp/components/activity_log_modal.jsx | |
| parent | 7af2e6f87a754312809aa044edd062930616401a (diff) | |
| parent | e60f6f3b137839ed603a1b5d45cf658b6570ff91 (diff) | |
| download | chat-6ccef5caf5ff33b765bd488d4f609c4426c7bbf0.tar.gz chat-6ccef5caf5ff33b765bd488d4f609c4426c7bbf0.tar.bz2 chat-6ccef5caf5ff33b765bd488d4f609c4426c7bbf0.zip | |
Merge pull request #2509 from asaadmahmoodspin/ui-improvements
Multiple UI improvements
Diffstat (limited to 'webapp/components/activity_log_modal.jsx')
| -rw-r--r-- | webapp/components/activity_log_modal.jsx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/webapp/components/activity_log_modal.jsx b/webapp/components/activity_log_modal.jsx index 9a4ff3ef2..f1dd4a26a 100644 --- a/webapp/components/activity_log_modal.jsx +++ b/webapp/components/activity_log_modal.jsx @@ -2,7 +2,6 @@ // See License.txt for license information. import $ from 'jquery'; -import ReactDOM from 'react-dom'; import UserStore from 'stores/user_store.jsx'; import * as Client from 'utils/client.jsx'; import * as AsyncClient from 'utils/async_client.jsx'; @@ -56,11 +55,8 @@ export default class ActivityLogModal extends React.Component { } onShow() { AsyncClient.getSessions(); - - if ($(window).width() > 768) { - $(ReactDOM.findDOMNode(this.refs.modalBody)).css('max-height', $(window).height() - 200); - } else { - $(ReactDOM.findDOMNode(this.refs.modalBody)).css('max-height', $(window).height() - 150); + if (!Utils.isMobile()) { + $('.modal-body').perfectScrollbar(); } } onHide() { |