mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #3366 from ether/release/1.6.4

Browse source 
Release/1.6.4
This commit is contained in:
John McLear 2018-04-07 11:05:31 +01:00 • committed by GitHub
commit 6a38826e9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 563 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/static/js/ace2_inner.js
View file

@ -5404,8 +5404,8 @@ function Ace2Inner(){
// height is taken to be the top offset of the next line. If we
// didn't do this special case, we would miss out on any top margin
// included on the first line. The default stylesheet doesn't add
// extra margins, but plugins might.
h = b.nextSibling.offsetTop;
// extra margins/padding, but plugins might.
h = b.nextSibling.offsetTop - window.getComputedStyle(doc.body).getPropertyValue("padding-top");
} else {
h = b.nextSibling.offsetTop - b.offsetTop;
}