mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Return permanent scrollbar (killed by refactoring)
This commit is contained in:
parent
388b33a6b4
commit
d644193441
3 changed files with 7 additions and 7 deletions
|
@ -44,6 +44,11 @@ body {
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
background-color: transparent !important;
|
background-color: transparent !important;
|
||||||
-webkit-font-smoothing: antialiased;
|
-webkit-font-smoothing: antialiased;
|
||||||
|
|
||||||
|
/* This keeps the scrollbar always present in all pages, so we avoid clipping while switching between pages
|
||||||
|
that need the scrollbar and pages that don't.
|
||||||
|
*/
|
||||||
|
overflow-y: scroll;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mainAnimatedPage {
|
.mainAnimatedPage {
|
||||||
|
@ -122,10 +127,6 @@ div[data-role=page] {
|
||||||
padding-bottom: 4em;
|
padding-bottom: 4em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.force-scroll {
|
|
||||||
overflow-y: scroll;
|
|
||||||
}
|
|
||||||
|
|
||||||
.hide-scroll {
|
.hide-scroll {
|
||||||
overflow-y: hidden;
|
overflow-y: hidden;
|
||||||
}
|
}
|
||||||
|
|
|
@ -492,7 +492,6 @@ export default function (options) {
|
||||||
document.removeEventListener((window.PointerEvent ? 'pointermove' : 'mousemove'), onPointerMove);
|
document.removeEventListener((window.PointerEvent ? 'pointermove' : 'mousemove'), onPointerMove);
|
||||||
// Shows page scrollbar
|
// Shows page scrollbar
|
||||||
document.body.classList.remove('hide-scroll');
|
document.body.classList.remove('hide-scroll');
|
||||||
document.body.classList.add('force-scroll');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -657,7 +656,6 @@ export default function (options) {
|
||||||
self.show = function () {
|
self.show = function () {
|
||||||
createElements(options);
|
createElements(options);
|
||||||
// Hides page scrollbar
|
// Hides page scrollbar
|
||||||
document.body.classList.remove('force-scroll');
|
|
||||||
document.body.classList.add('hide-scroll');
|
document.body.classList.add('hide-scroll');
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -107,7 +107,7 @@ function tryRemoveElement(elem) {
|
||||||
const animatedPage = document.querySelector('.page:not(.hide)');
|
const animatedPage = document.querySelector('.page:not(.hide)');
|
||||||
animatedPage.classList.add('hide');
|
animatedPage.classList.add('hide');
|
||||||
// At this point, we must hide the scrollbar placeholder, so it's not being displayed while the item is being loaded
|
// At this point, we must hide the scrollbar placeholder, so it's not being displayed while the item is being loaded
|
||||||
document.body.classList.remove('force-scroll');
|
document.body.classList.add('hide-scroll');
|
||||||
}
|
}
|
||||||
|
|
||||||
function zoomIn(elem) {
|
function zoomIn(elem) {
|
||||||
|
@ -679,6 +679,7 @@ function tryRemoveElement(elem) {
|
||||||
destroyFlvPlayer(this);
|
destroyFlvPlayer(this);
|
||||||
|
|
||||||
appRouter.setTransparency('none');
|
appRouter.setTransparency('none');
|
||||||
|
document.body.classList.remove('hide-scroll');
|
||||||
|
|
||||||
const videoElement = this.#mediaElement;
|
const videoElement = this.#mediaElement;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue