diff options
author | Asaad Mahmood <asaad@spinpunch.com> | 2015-12-10 21:00:08 +0500 |
---|---|---|
committer | Asaad Mahmood <asaad@spinpunch.com> | 2015-12-10 21:00:08 +0500 |
commit | 2e19d529aa1f7c0eac7b26596e657b7820944c17 (patch) | |
tree | 474a4d9c499906800d90977941b0dd1296e38d47 /web | |
parent | 6350b3e268c009c3e318196c93ad4fb189c1e51d (diff) | |
download | chat-2e19d529aa1f7c0eac7b26596e657b7820944c17.tar.gz chat-2e19d529aa1f7c0eac7b26596e657b7820944c17.tar.bz2 chat-2e19d529aa1f7c0eac7b26596e657b7820944c17.zip |
Updating code for direct messages
Diffstat (limited to 'web')
-rw-r--r-- | web/react/components/more_direct_channels.jsx | 6 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_modal.scss | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/web/react/components/more_direct_channels.jsx b/web/react/components/more_direct_channels.jsx index a65ce21d1..c14bec52b 100644 --- a/web/react/components/more_direct_channels.jsx +++ b/web/react/components/more_direct_channels.jsx @@ -55,10 +55,10 @@ export default class MoreDirectChannels extends React.Component { onShow() { if ($(window).width() > 768) { - $(ReactDOM.findDOMNode(this.refs.modalBody)).perfectScrollbar(); - $(ReactDOM.findDOMNode(this.refs.modalBody)).css('max-height', $(window).height() - 200); + $(ReactDOM.findDOMNode(this.refs.userList)).perfectScrollbar(); + $(ReactDOM.findDOMNode(this.refs.userList)).css('max-height', $(window).height() - 300); } else { - $(ReactDOM.findDOMNode(this.refs.modalBody)).css('max-height', $(window).height() - 150); + $(ReactDOM.findDOMNode(this.refs.userList)).css('max-height', $(window).height() - 250); } } diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index d533b4e9e..6f70e502f 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -381,6 +381,8 @@ .more-modal { .user-list { + overflow-y: auto; + overflow-x: hidden; margin-top: 10px; max-height: 500px; position: relative; |