libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

chat: fix coloring with dark background, and scrolling chattext when new message come in

Browse source
This commit is contained in:
Sebastian Castro 2020-04-17 09:57:50 +02:00 committed by muxator
parent 780eaad573
commit 3e12b6d132
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/static/js/chat.js
View file

@ -89,7 +89,7 @@ var chat = (function()
scrollDown: function() scrollDown: function()
{ {
if($('.chat-content').is(':visible')){ if($('.chat-content').is(':visible')){
if(!self.lastMessage || !self.lastMessage.position() || self.lastMessage.position().top < $('#chattext').height()) { if(!self.lastMessage || !self.lastMessage.position() || self.lastMessage.position().top < ($('#chattext').outerHeight() + 20)) {
// if we use a slow animate here we can have a race condition when a users focus can not be moved away // if we use a slow animate here we can have a race condition when a users focus can not be moved away
// from the last message recieved. // from the last message recieved.
$('#chattext').animate({scrollTop: $('#chattext')[0].scrollHeight}, { duration: 400, queue: false }); $('#chattext').animate({scrollTop: $('#chattext')[0].scrollHeight}, { duration: 400, queue: false });

1
src/static/skins/colibris/src/components/chat.css
View file

@ -1,5 +1,6 @@
#chatbox { #chatbox {
background-color: transparent !important; background-color: transparent !important;
color: var(--text-color);
} }
.chat-content { .chat-content {
background: none; background: none;