Merge branch 'master' of https://github.com/syuilo/misskey
This commit is contained in:
commit
6ed694a3f5
1 changed files with 4 additions and 2 deletions
|
@ -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`;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue