summaryrefslogtreecommitdiffstats
path: root/web/react/components/activity_log_modal.jsx
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-12-08 08:08:46 -0500
committerJoram Wilander <jwawilander@gmail.com>2015-12-08 08:08:46 -0500
commit92c6eceb0fff33e3f269767343c7f321fd90f4ca (patch)
tree8220e09a4dfe5f74958cf69ba6a8a39af1ee119c /web/react/components/activity_log_modal.jsx
parent2bf13c91fa3b66123cb1c864229498ba820435dc (diff)
parent3265a545cf3fbab187e5968772c5d733a7d2bfb5 (diff)
downloadchat-92c6eceb0fff33e3f269767343c7f321fd90f4ca.tar.gz
chat-92c6eceb0fff33e3f269767343c7f321fd90f4ca.tar.bz2
chat-92c6eceb0fff33e3f269767343c7f321fd90f4ca.zip
Merge pull request #1637 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
Diffstat (limited to 'web/react/components/activity_log_modal.jsx')
-rw-r--r--web/react/components/activity_log_modal.jsx4
1 files changed, 3 insertions, 1 deletions
diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx
index 200f4d724..f5341c0bc 100644
--- a/web/react/components/activity_log_modal.jsx
+++ b/web/react/components/activity_log_modal.jsx
@@ -51,9 +51,11 @@ export default class ActivityLogModal extends React.Component {
onShow() {
AsyncClient.getSessions();
- $(ReactDOM.findDOMNode(this.refs.modalBody)).css('max-height', $(window).height() - 50);
if ($(window).width() > 768) {
$(ReactDOM.findDOMNode(this.refs.modalBody)).perfectScrollbar();
+ $(ReactDOM.findDOMNode(this.refs.modalBody)).css('max-height', $(window).height() - 200);
+ } else {
+ $(ReactDOM.findDOMNode(this.refs.modalBody)).css('max-height', $(window).height() - 150);
}
}
onHide() {