Merge branch 'master' of https://github.com/jellyfin/jellyfin-web into Deminify-part-4

# Resolve Conflicts:
#	src/controllers/dashboard/general.js
This commit is contained in:
grafixeyehero 2020-01-27 19:20:48 +03:00
commit 16b6e7e4ed
126 changed files with 5234 additions and 2354 deletions

View file

@ -3,40 +3,50 @@
position: fixed;
top: 0;
bottom: 0;
contain: strict
contain: strict;
}
.touch-menu-la {
background-color: #FFF;
background-color: #fff;
will-change: transform;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-transition: -webkit-transform ease-out 40ms, left ease-out 260ms;
-o-transition: transform ease-out 40ms, left ease-out 260ms;
transition: transform ease-out 40ms, left ease-out 260ms;
z-index: 1099
z-index: 1099;
}
.touch-menu-la.transition {
transition: transform ease-out 240ms, left ease-out 260ms
-webkit-transition: -webkit-transform ease-out 240ms, left ease-out 260ms;
-o-transition: transform ease-out 240ms, left ease-out 260ms;
transition: transform ease-out 240ms, left ease-out 260ms;
}
.drawer-open {
box-shadow: 2px 0 12px rgba(0, 0, 0, .4)
-webkit-box-shadow: 2px 0 12px rgba(0, 0, 0, 0.4);
box-shadow: 2px 0 12px rgba(0, 0, 0, 0.4);
}
.scrollContainer {
flex-grow: 1
-webkit-box-flex: 1;
-webkit-flex-grow: 1;
flex-grow: 1;
}
.tmla-mask {
left: 0;
right: 0;
background-color: #000;
opacity: 0;
z-index: 1098;
transition: opacity ease-in-out .38s, visibility ease-in-out .38s;
-webkit-transition: opacity ease-in-out 0.38s, visibility ease-in-out 0.38s;
-o-transition: opacity ease-in-out 0.38s, visibility ease-in-out 0.38s;
transition: opacity ease-in-out 0.38s, visibility ease-in-out 0.38s;
will-change: opacity;
background-color: rgba(0, 0, 0, .3)
background-color: rgba(0, 0, 0, 0.3);
}
.tmla-mask.backdrop {
opacity: 1
}
opacity: 1;
}