diff options
Diffstat (limited to 'web/templates')
| -rw-r--r-- | web/templates/admin_console.html | 2 | ||||
| -rw-r--r-- | web/templates/channel.html | 2 | ||||
| -rw-r--r-- | web/templates/head.html | 9 |
3 files changed, 7 insertions, 6 deletions
diff --git a/web/templates/admin_console.html b/web/templates/admin_console.html index a046478f6..574caf730 100644 --- a/web/templates/admin_console.html +++ b/web/templates/admin_console.html @@ -12,7 +12,7 @@ <div id='select_team_modal'></div> <script> - window.setup_admin_console_page(); + window.setup_admin_console_page({{ .Props }}); $(document).ready(function(){ $('[data-toggle="tooltip"]').tooltip(); diff --git a/web/templates/channel.html b/web/templates/channel.html index 2af94e415..4b8318d43 100644 --- a/web/templates/channel.html +++ b/web/templates/channel.html @@ -54,7 +54,7 @@ <script> window.setup_channel_page({{ .Props }}); $('body').tooltip( {selector: '[data-toggle=tooltip]'} ); - $('.modal-body').css('max-height', $(window).height() * 0.7); + $('.modal-body').css('max-height', $(window).height() - 200); $('.modal-body').perfectScrollbar(); </script> </body> diff --git a/web/templates/head.html b/web/templates/head.html index e4f1b56b3..3466510d4 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -32,12 +32,13 @@ <link id="favicon" rel="icon" href="/static/images/favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="/static/images/favicon.ico" type="image/x-icon"> - <script src="/static/js/react-with-addons-0.13.3.js"></script> - <script src="/static/js/jquery-1.11.1.js"></script> + <script src="/static/js/react-0.14.0.js"></script> + <script src="/static/js/react-dom-0.14.0.js"></script> + <script src="/static/js/jquery-2.1.4.js"></script> <script src="/static/js/bootstrap-3.3.5.js"></script> <script src="/static/js/bootstrap-colorpicker.min.js"></script> - <script src="/static/js/react-bootstrap-0.25.1.js"></script> - <script src="/static/js/perfect-scrollbar-0.6.5.jquery.min.js"></script> + <script src="/static/js/react-bootstrap-0.27.1.js"></script> + <script src="/static/js/perfect-scrollbar-0.6.7.jquery.min.js"></script> <script src="/static/js/jquery-dragster/jquery.dragster.js"></script> <style id="antiClickjack">body{display:none !important;}</style> |