diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-03-31 22:42:28 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-03-31 22:42:28 +0200 |
| commit | 6c2673ae2aa311ee92b5b12b969b4483b52eef53 (patch) | |
| tree | d5765a0e2e4ccfa6fd94649c2ff04907a054ebbc /view/tpl | |
| parent | 3fdd110e0775113d2246a9db16c6c920ecddf19d (diff) | |
| download | volse-hubzilla-6c2673ae2aa311ee92b5b12b969b4483b52eef53.tar.gz volse-hubzilla-6c2673ae2aa311ee92b5b12b969b4483b52eef53.tar.bz2 volse-hubzilla-6c2673ae2aa311ee92b5b12b969b4483b52eef53.zip | |
various fixes regarding mod chat
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/chat.tpl | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index b18318044..1001f28b3 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -30,8 +30,8 @@ <div class="form-group"> </div> - <div id="chat-submit-wrapper" class="form-group"> - <div id="chat-submit" class="btn-group dropup pull-right"> + <div id="chat-submit-wrapper"> + <div id="chat-submit" class="dropup pull-right"> <button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown"><i class="icon-caret-down"></i></button> <button class="btn btn-primary btn-sm" type="submit" id="chat-submit" name="submit" value="{{$submit}}">{{$submit}}</button> <ul class="dropdown-menu"> @@ -109,14 +109,13 @@ $(document).ready(function() { chat_timer = setTimeout(load_chats,300); $('#chatroom_bookmarks, #vcard').hide(); $('#chatroom_list, #chatroom_members').show(); - - $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 40 ); - + $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 23 ); }); $(window).resize(function () { - var navHeight = $('.generic-content-wrapper').hasClass('fullscreen') ? 0 : $('nav').outerHeight(true) - $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - navHeight - 40 ); + var navHeight = $('.generic-content-wrapper').hasClass('fullscreen') ? 0 : $('nav').outerHeight(true); + $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - navHeight - 23); + $('#chatTopBar').scrollTop($('#chatTopBar').scrollTop() + $('#chatTopBar').outerHeight(true)); }); $('#chat-form').submit(function(ev) { @@ -196,18 +195,18 @@ function addmailtext(data) { } function makeFullScreen() { - $('#fullscreen').hide(); + $('#fullscreen, aside').hide(); $('#inline').show(); $('.generic-content-wrapper').addClass('fullscreen'); - $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 20); + $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 23); } function makeInline() { - $('#fullscreen').show(); + $('#fullscreen, aside').show(); $('#inline').hide(); $('.generic-content-wrapper').removeClass('fullscreen'); - $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 40 ); + $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 23); } </script> |