From 901b830f2d5809d55890508b99ef5a868aace4e4 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Mon, 7 Dec 2015 21:18:03 +0500 Subject: Multiple UI Improvements --- web/react/components/user_settings/manage_outgoing_hooks.jsx | 2 +- web/react/components/user_settings/user_settings_modal.jsx | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'web/react/components/user_settings') diff --git a/web/react/components/user_settings/manage_outgoing_hooks.jsx b/web/react/components/user_settings/manage_outgoing_hooks.jsx index 9c88bb819..9c0fe3709 100644 --- a/web/react/components/user_settings/manage_outgoing_hooks.jsx +++ b/web/react/components/user_settings/manage_outgoing_hooks.jsx @@ -188,7 +188,7 @@ export default class ManageOutgoingHooks extends React.Component { key={hook.id} className='webhook__item' > -
+
{'URLs: '}{hook.callback_urls.join(', ')}
{channelDiv} diff --git a/web/react/components/user_settings/user_settings_modal.jsx b/web/react/components/user_settings/user_settings_modal.jsx index 97c601b5e..36e1aa217 100644 --- a/web/react/components/user_settings/user_settings_modal.jsx +++ b/web/react/components/user_settings/user_settings_modal.jsx @@ -47,9 +47,11 @@ export default class UserSettingsModal extends React.Component { } handleShow() { - $(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() - 50); } } -- cgit v1.2.3-1-g7c22