diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-14 16:59:24 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-14 16:59:24 -0700 |
| commit | 3bd350dcaf65a89040f7ea395a19b620819ba03e (patch) | |
| tree | 72b49e6fadfc1d513489b8938d5f73620ff2a6d8 /web/templates | |
| parent | e06e292be71ca699d90bafbd635118aa47c2d7a5 (diff) | |
| parent | bfebb41bc0c0a1c5f481617f912bdf6dd483c341 (diff) | |
| download | chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.tar.gz chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.tar.bz2 chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.zip | |
Merge branch 'master' into PLT-12-log
Diffstat (limited to 'web/templates')
| -rw-r--r-- | web/templates/channel.html | 1 | ||||
| -rw-r--r-- | web/templates/head.html | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/web/templates/channel.html b/web/templates/channel.html index 9bfd1fa35..a732a25ce 100644 --- a/web/templates/channel.html +++ b/web/templates/channel.html @@ -52,6 +52,7 @@ <script> window.setup_channel_page('{{ .Props.TeamDisplayName }}', '{{ .Props.TeamType }}', '{{ .Props.TeamId }}', '{{ .Props.ChannelName }}', '{{ .Props.ChannelId }}'); $('body').tooltip( {selector: '[data-toggle=tooltip]'} ); + $('.modal-body').css('max-height', $(window).height() * 0.7); $('.modal-body').perfectScrollbar(); </script> </body> diff --git a/web/templates/head.html b/web/templates/head.html index 76ee70ced..55c729476 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -18,12 +18,13 @@ <link rel="manifest" href="/static/config/manifest.json"> <!-- Android add to homescreen --> - <link rel="stylesheet" href="/static/css/bootstrap-3.3.1.min.css"> + <link rel="stylesheet" href="/static/css/bootstrap-3.3.5.min.css"> <link rel="stylesheet" href="/static/css/jasny-bootstrap.min.css" rel="stylesheet"> - <script src="/static/js/react-with-addons-0.13.1.js"></script> + <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/bootstrap-3.3.1.js"></script> + <script src="/static/js/bootstrap-3.3.5.js"></script> + <script src="/static/js/react-bootstrap-0.25.1.js"></script> <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"> |