aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/chat.tpl
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-04-03 00:19:30 +0200
committerMario Vavti <mario@mariovavti.com>2016-04-03 00:19:30 +0200
commit2772a7209594bf239200e81e48d997d49dea2daf (patch)
treeae401630a4883e8dc772222d9eccc862eb3df9cd /view/tpl/chat.tpl
parent381cc3e6f806bc99a2c4a529c34a6e4e2de15f28 (diff)
parente361ee9253d0a235a6b54fae1a1d6a25a6541342 (diff)
downloadvolse-hubzilla-2772a7209594bf239200e81e48d997d49dea2daf.tar.gz
volse-hubzilla-2772a7209594bf239200e81e48d997d49dea2daf.tar.bz2
volse-hubzilla-2772a7209594bf239200e81e48d997d49dea2daf.zip
ge branch 'master' into dev
Diffstat (limited to 'view/tpl/chat.tpl')
-rw-r--r--view/tpl/chat.tpl3
1 files changed, 1 insertions, 2 deletions
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 633437069..eb219f128 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -119,7 +119,6 @@ $(window).resize(function () {
else {
adjustInlineTopBarHeight();
}
- $('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight'));
});
$('#chat-form').submit(function(ev) {
@@ -197,7 +196,7 @@ function addmailtext(data) {
}
function adjustFullscreenTopBarHeight() {
- $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 23);
+ $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 16);
$('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight'));
}