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

Merge remote-tracking branch 'upstream/master' into material-icons

This commit is contained in:
MrTimscampi 2020-01-29 08:45:20 +01:00
commit cdefae3dee
128 changed files with 5226 additions and 2581 deletions

View file

@ -5,39 +5,39 @@
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-webkit-flex-direction: row;
flex-direction: row
flex-direction: row;
}
.navigationSection {
text-align: center
text-align: center;
}
.btnArrowUp{
.btnArrowUp {
border-radius: 40% 40% 10% 10%;
}
.btnArrowLeft{
.btnArrowLeft {
border-radius: 40% 10% 10% 40%;
}
.btnArrowRight{
.btnArrowRight {
border-radius: 10% 40% 40% 10%;
}
.btnArrowDown{
.btnArrowDown {
border-radius: 10% 10% 40% 40%;
}
.btnOk{
.btnOk {
border-radius: 10%;
}
.nowPlayingPageTitle {
margin: 0 0 .5em .5em
margin: 0 0 0.5em 0.5em;
}
.nowPlayingPositionSliderContainer {
margin: .7em 0 .7em 1em
margin: 0.7em 0 0.7em 1em;
}
.nowPlayingInfoButtons {
@ -48,27 +48,27 @@
-webkit-align-items: center;
align-items: center;
-webkit-flex-wrap: wrap;
flex-wrap: wrap
flex-wrap: wrap;
}
.nowPlayingInfoControls,
.nowPlayingTime {
display: flex;
display: -webkit-box;
display: -webkit-flex
display: -webkit-flex;
}
.nowPlayingPageImageContainer {
width: 20%;
margin-right: .25em;
margin-right: 0.25em;
position: relative;
-webkit-flex-shrink: 0;
flex-shrink: 0
flex-shrink: 0;
}
@media all and (min-width:50em) {
@media all and (min-width: 50em) {
.nowPlayingPageImageContainer {
width: 16%
width: 16%;
}
}
@ -83,7 +83,7 @@
flex-direction: column;
-webkit-box-pack: center;
-webkit-justify-content: center;
justify-content: center
justify-content: center;
}
.nowPlayingPageImage {
@ -93,16 +93,16 @@
width: 100%;
-webkit-box-shadow: 0 0 1.9vh #000;
box-shadow: 0 0 1.9vh #000;
border: .1em solid #222;
border: 0.1em solid #222;
user-drag: none;
user-select: none;
-moz-user-select: none;
-webkit-user-drag: none;
-webkit-user-select: none;
-ms-user-select: none
-ms-user-select: none;
}
@media all and (orientation:portrait) and (max-width:50em) {
@media all and (orientation: portrait) and (max-width: 50em) {
.nowPlayingInfoContainer {
-webkit-box-orient: vertical !important;
-webkit-box-direction: normal !important;
@ -110,43 +110,43 @@
flex-direction: column !important;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center
align-items: center;
}
.nowPlayingPageTitle {
text-align: center;
margin: .5em 0 .75em
margin: 0.5em 0 0.75em;
}
.nowPlayingPositionSliderContainer {
margin: .7em 1em
margin: 0.7em 1em;
}
.nowPlayingInfoButtons {
-webkit-box-pack: center;
-webkit-justify-content: center;
justify-content: center
justify-content: center;
}
.nowPlayingPageImageContainer {
width: auto;
margin-right: 0
margin-right: 0;
}
.nowPlayingInfoControls {
margin-top: 1em;
max-width: 100%
max-width: 100%;
}
.nowPlayingPageImage {
width: auto;
height: 36vh
height: 36vh;
}
}
@media all and (orientation:portrait) and (max-width:40em) {
@media all and (orientation: portrait) and (max-width: 40em) {
.nowPlayingPageImage {
height: 30vh
height: 30vh;
}
}
@ -155,7 +155,7 @@
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
margin: 0 1em
margin: 0 1em;
}
.nowPlayingSecondaryButtons {
@ -169,35 +169,35 @@
flex-wrap: wrap;
-webkit-box-pack: center;
-webkit-justify-content: center;
justify-content: center
justify-content: center;
}
@media all and (min-width:50em) {
@media all and (min-width: 50em) {
.nowPlayingSecondaryButtons {
-webkit-box-flex: 1;
-webkit-flex-grow: 1;
flex-grow: 1;
-webkit-box-pack: end;
-webkit-justify-content: flex-end;
justify-content: flex-end
justify-content: flex-end;
}
}
@media all and (min-width:80em) {
@media all and (min-width: 80em) {
.nowPlayingPageImageContainer {
margin-right: .75em
margin-right: 0.75em;
}
}
.nowPlayingNavButtonContainer {
width: 30em
width: 30em;
}
.smallBackdropPosterItem .cardOverlayInner>div {
.smallBackdropPosterItem .cardOverlayInner > div {
white-space: nowrap;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
overflow: hidden
overflow: hidden;
}
.playlistIndexIndicatorImage {
@ -207,32 +207,33 @@
}
.hideVideoButtons .videoButton {
display: none
display: none;
}
.nowPlayingVolumeSliderContainer {
width: 9em
width: 9em;
}
@media all and (max-width:50em) {
@media all and (max-width: 50em) {
.nowPlayingInfoButtons .nowPlayingPageUserDataButtons {
display: none !important
display: none !important;
}
.navigationSection .collapseContent i{
.navigationSection .collapseContent i {
font-size: 4em;
}
}
@media all and (max-width:47em) {
@media all and (max-width: 47em) {
.nowPlayingInfoButtons .repeatToggleButton {
display: none !important
display: none !important;
}
}
@media all and (max-width:34em) {
@media all and (max-width: 34em) {
.nowPlayingInfoButtons .btnNowPlayingFastForward,
.nowPlayingInfoButtons .btnNowPlayingRewind,
.nowPlayingInfoButtons .playlist .listItemMediaInfo {
display: none !important
display: none !important;
}
}