1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update shared dialogs

This commit is contained in:
Luke Pulverenti 2016-05-13 02:22:02 -04:00
parent 1190972d6c
commit 6e6017eeaf
16 changed files with 208 additions and 125 deletions

View file

@ -4,7 +4,6 @@
z-index: 999999 !important;
position: fixed;
margin: 24px 40px;
-webkit-overflow-scrolling: touch;
-webkit-font-smoothing: antialiased;
box-shadow: 0 16px 24px 2px rgba(0, 0, 0, 0.14), 0 6px 30px 5px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.4);
height: auto;
@ -32,21 +31,6 @@
max-width: 70%;
}
.dialog.scrollY {
overflow-y: auto;
-webkit-overflow-scrolling: touch;
overflow-x: hidden;
}
.dialog.hiddenScroll::-webkit-scrollbar {
display: none;
}
.dialog.hiddenScroll {
-ms-overflow-style: none;
overflow: -moz-scrollbars-none;
}
@media all and (min-width: 1280px) and (min-height: 720px) {
.dialog.medium {
@ -80,14 +64,9 @@
}
.dialog > * {
margin-top: 20px;
padding: 0 24px;
}
.dialog > *:first-child {
margin-top: 24px;
}
.dialog .buttons {
position: relative;
padding: 8px 8px 8px 24px;

View file

@ -1,4 +1,4 @@
define(['historyManager', 'focusManager', 'browser', 'layoutManager', 'inputManager', 'css!./dialoghelper.css'], function (historyManager, focusManager, browser, layoutManager, inputManager) {
define(['historyManager', 'focusManager', 'browser', 'layoutManager', 'inputManager', 'scrollHelper', 'css!./dialoghelper.css', 'scrollStyles'], function (historyManager, focusManager, browser, layoutManager, inputManager, scrollHelper) {
function dialogHashHandler(dlg, hash, resolve) {
@ -380,11 +380,12 @@
dlg.classList.add('dialog');
dlg.classList.add('scrollY');
if (options.scrollY !== false) {
dlg.classList.add('smoothScrollY');
if (layoutManager.tv || layoutManager.mobile) {
// Need scrollbars for mouse use
dlg.classList.add('hiddenScroll');
if (layoutManager.tv) {
scrollHelper.centerFocus.on(dlg, false);
}
}
if (options.removeOnClose) {