diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-12-03 08:23:43 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-12-03 08:23:43 -0500 |
| commit | e92695c4a4a027e428ad32b69583bee25a3ba24a (patch) | |
| tree | f81fb936fff2a2e64c64d92b5181ae610574304b /web/templates | |
| parent | eddd4e0fc49582cf7f484168f5e2c08b0ac89596 (diff) | |
| parent | 482e3fc9a494a54df53d99b060a7cfa13b3d95c0 (diff) | |
| download | chat-e92695c4a4a027e428ad32b69583bee25a3ba24a.tar.gz chat-e92695c4a4a027e428ad32b69583bee25a3ba24a.tar.bz2 chat-e92695c4a4a027e428ad32b69583bee25a3ba24a.zip | |
Merge pull request #1579 from hmhealey/plt1298
PLT-1298 Converted Command and @Mention autocomplete to new suggestion components
Diffstat (limited to 'web/templates')
| -rw-r--r-- | web/templates/channel.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/web/templates/channel.html b/web/templates/channel.html index 7b8f6a243..8abbe36df 100644 --- a/web/templates/channel.html +++ b/web/templates/channel.html @@ -26,13 +26,13 @@ <script> window.setup_channel_page({{ .Props }}, {{ .Team }}, {{ .Channel }}, {{ .User }}); $('body').tooltip( {selector: '[data-toggle=tooltip]'} ); + var modals = $('.modal-body').not('.edit-modal-body'); if($(window).height() > 1200){ - $('.modal-body').css('max-height', 1000); + modals.css('max-height', 1000); + } else { + modals.css('max-height', $(window).height() - 200); } - else { - $('.modal-body').css('max-height', $(window).height() - 200); - } - $('.modal-body').perfectScrollbar(); + modals.perfectScrollbar(); </script> </body> </html> |