diff options
| author | hmhealey <harrisonmhealey@gmail.com> | 2015-12-02 09:56:40 -0500 |
|---|---|---|
| committer | hmhealey <harrisonmhealey@gmail.com> | 2015-12-02 09:56:40 -0500 |
| commit | 89731e9ef107fd633a20af2acfbe397d51312ac4 (patch) | |
| tree | 6c7ee853c1515cc7c6a4aa6bf480884072f65405 /web | |
| parent | 7308569375159134d0f8651cec94b3f9c706604a (diff) | |
| download | chat-89731e9ef107fd633a20af2acfbe397d51312ac4.tar.gz chat-89731e9ef107fd633a20af2acfbe397d51312ac4.tar.bz2 chat-89731e9ef107fd633a20af2acfbe397d51312ac4.zip | |
Fixed suggestion list height in the edit post modal and RHS
Diffstat (limited to 'web')
| -rw-r--r-- | web/sass-files/sass/partials/_modal.scss | 8 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_sidebar--right.scss | 4 | ||||
| -rw-r--r-- | web/templates/channel.html | 10 |
3 files changed, 17 insertions, 5 deletions
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 4a56bc6c7..01c9e136c 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -405,3 +405,11 @@ @include opacity(0.7); } } + +.modal-body.edit-modal-body { + overflow: visible; + + .suggestion-content { + max-height: 150px; + } +} diff --git a/web/sass-files/sass/partials/_sidebar--right.scss b/web/sass-files/sass/partials/_sidebar--right.scss index 43162831d..735b2a99e 100644 --- a/web/sass-files/sass/partials/_sidebar--right.scss +++ b/web/sass-files/sass/partials/_sidebar--right.scss @@ -93,6 +93,10 @@ padding-bottom: 10px; } } + + .suggestion-content { + max-height: 120px; + } } .sidebar-right-container { 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> |