natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/syuilo/misskey

This commit is contained in:
syuilo 2017-11-18 22:39:14 +09:00
parent 3d61d8b5ed 235acda851
commit 6ed694a3f5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/web/app/desktop/tags/home.tag
View File

@ -271,9 +271,11 @@
const widgetsBottom = (rect.top + window.scrollY) + rect.height; const widgetsBottom = (rect.top + window.scrollY) + rect.height;
if (windowBottom > widgetsBottom && widgetsHeight > window.innerHeight) { if (windowBottom > widgetsBottom && widgetsHeight > window.innerHeight) {
widgets.parentNode.style.marginTop = `${(windowBottom - rect.height) - this.containerTop}px`; const top = (windowBottom - rect.height) - this.containerTop;
widgets.parentNode.style.marginTop = `${top}px`;
} else if (windowTop < rect.top + window.scrollY || widgetsHeight < window.innerHeight) { } else if (windowTop < rect.top + window.scrollY || widgetsHeight < window.innerHeight) {
widgets.parentNode.style.marginTop = `${(windowTop - this.containerTop)}px`; const top = windowTop - this.containerTop;
widgets.parentNode.style.marginTop = `${top}px`;
} }
}; };