Merge branch 'master' of https://github.com/jellyfin/jellyfin-web into item-detail-page-

# Conflicts:
#	src/assets/css/librarybrowser.css
#	src/itemdetails.html
This commit is contained in:
grafixeyehero 2020-01-23 20:51:30 +03:00
commit 709b48a8a8
129 changed files with 2629 additions and 1199 deletions

View file

@ -1,6 +1,8 @@
.dashboardColumn,
.dashboardSections {
flex-direction: column;
-webkit-box-orient: vertical;
-webkit-box-direction: normal
}
.dashboardFooter {
@ -14,6 +16,8 @@
progress {
appearance: none;
-moz-appearance: none;
-webkit-appearance: none;
margin: 0;
background: #ccc !important
}
@ -73,17 +77,23 @@ progress[aria-valuenow]:before {
div[data-role=controlgroup] a[data-role=button] {
display: inline-block !important;
margin: 0 !important;
-webkit-box-shadow: none !important;
box-shadow: none !important;
-webkit-border-radius: 0;
border-radius: 0
}
div[data-role=controlgroup] a[data-role=button]:first-child {
-webkit-border-bottom-left-radius: .3125em;
border-bottom-left-radius: .3125em;
-webkit-border-top-left-radius: .3125em;
border-top-left-radius: .3125em
}
div[data-role=controlgroup] a[data-role=button]:last-child {
-webkit-border-bottom-right-radius: .3125em;
border-bottom-right-radius: .3125em;
-webkit-border-top-right-radius: .3125em;
border-top-right-radius: .3125em
}
@ -137,14 +147,23 @@ div[data-role=controlgroup] a.ui-btn-active {
}
.dashboardSections {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-flex-direction: column;
flex-direction: column
}
.dashboardColumn {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-flex-direction: column;
flex-direction: column;
-webkit-flex-shrink: 0;
flex-shrink: 0;
-webkit-box-flex: 1;
-webkit-flex-grow: 1;
flex-grow: 1
}
@ -153,6 +172,7 @@ div[data-role=controlgroup] a.ui-btn-active {
}
.dashboardSection {
-webkit-flex-shrink: 0;
flex-shrink: 0;
margin: 0 0 2em
}
@ -168,7 +188,11 @@ div[data-role=controlgroup] a.ui-btn-active {
@media all and (min-width:70em) {
.dashboardSections {
-webkit-flex-wrap: wrap;
flex-wrap: wrap;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-webkit-flex-direction: row;
flex-direction: row
}
@ -273,6 +297,7 @@ div[data-role=controlgroup] a.ui-btn-active {
}
.sessionNowPlayingContent {
-webkit-background-size: cover;
background-size: cover;
background-repeat: no-repeat;
background-position: center center;
@ -371,6 +396,7 @@ div[data-role=controlgroup] a.ui-btn-active {
}
.disabledUser {
-webkit-filter: grayscale(100%);
filter: grayscale(100%)
}
@ -392,6 +418,9 @@ div[data-role=controlgroup] a.ui-btn-active {
a[data-role=button] {
background-clip: padding-box;
-webkit-font-smoothing: antialiased;
-webkit-user-select: none;
-webkit-background-clip: padding-box;
cursor: pointer !important;
font-family: inherit !important;
font-weight: 500 !important;
@ -403,21 +432,37 @@ a[data-role=button] {
background: #292929 !important;
}
@keyframes rotating {
@-webkit-keyframes rotating {
from {
-webkit-transform: rotate(0);
transform: rotate(0)
}
to {
-webkit-transform: rotate(360deg);
transform: rotate(360deg)
}
}
@keyframes rotating {
from {
-webkit-transform: rotate(0);
transform: rotate(0)
}
to {
-webkit-transform: rotate(360deg);
transform: rotate(360deg)
}
}
.rotatingCircle {
-webkit-animation: rotating 2s linear infinite;
animation: rotating 2s linear infinite
}
.pluginPreviewImg {
-webkit-box-shadow: 0 .0725em .29em 0 rgba(0, 0, 0, .37);
box-shadow: 0 .0725em .29em 0 rgba(0, 0, 0, .37)
}

View file

@ -4,6 +4,7 @@ html {
html {
font-size: 93%;
-webkit-text-size-adjust: 100%;
text-size-adjust: 100%;
}

View file

@ -15,6 +15,7 @@
.headerSelectedPlayer,
.itemMiscInfo,
.navMenuOptionText {
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
overflow: hidden
}
@ -47,6 +48,8 @@
z-index: 1;
margin: 0 !important;
top: 6.9em !important;
-webkit-transition: -webkit-transform .2s ease-out;
-o-transition: transform .2s ease-out;
transition: transform .2s ease-out
}
@ -55,14 +58,17 @@
}
.headerUserImage {
-webkit-background-size: contain;
background-size: contain;
background-repeat: no-repeat;
background-position: center center;
-webkit-border-radius: 100em;
border-radius: 100em;
display: inline-block
}
.headerUserButtonRound div {
-webkit-border-radius: 100em;
border-radius: 100em;
background-size: cover;
background-repeat: no-repeat;
@ -70,6 +76,7 @@
}
.headerButton {
-webkit-flex-shrink: 0;
flex-shrink: 0
}
@ -83,25 +90,35 @@
}
.pageTitle {
display: -webkit-inline-box;
display: -webkit-inline-flex;
display: inline-flex;
margin: .3em 0 0 .5em;
height: 1.7em;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
-webkit-flex-shrink: 1;
flex-shrink: 1
}
.headerLeft,
.skinHeader {
display: flex;
display: -webkit-box;
display: -webkit-flex
}
.detailButton,
.skinHeader {
flex-direction: column;
-webkit-flex-direction: column;
-webkit-box-orient: vertical;
-webkit-box-direction: normal
}
.pageTitleWithLogo {
background-position: left center;
-webkit-background-size: contain;
background-size: contain;
background-repeat: no-repeat;
width: 13.2em
@ -121,7 +138,7 @@
.headerLeft,
.headerRight {
justify-content: center;
-webkit-box-align: center
}
.hiddenViewMenuBar .skinHeader {
@ -134,10 +151,13 @@
.headerLeft {
display: flex;
-webkit-align-items: center;
align-items: center;
-webkit-box-flex: 1;
-webkit-flex-grow: 1;
flex-grow: 1;
overflow: hidden;
justify-content: left;
justify-content: flex-start;
}
.sectionTabs {
@ -145,8 +165,13 @@
}
.headerRight {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-align-items: center;
align-items: center;
-webkit-box-pack: end;
-webkit-justify-content: flex-end;
justify-content: flex-end
}
@ -155,19 +180,27 @@
}
.navMenuOption {
display: -webkit-box !important;
display: -webkit-flex !important;
display: flex !important;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
text-decoration: none;
color: inherit;
padding: .9em 0 .9em 2.4em !important;
-webkit-box-flex: 1;
-webkit-flex-grow: 1;
flex-grow: 1;
font-weight: 400 !important;
margin: 0 !important;
-webkit-border-radius: 0 !important;
border-radius: 0 !important
}
.navMenuOptionIcon {
margin-right: 1.2em;
-webkit-flex-shrink: 0;
flex-shrink: 0
}
@ -181,6 +214,8 @@
}
.dashboardDocument .skinBody {
-webkit-transition: left ease-in-out .3s, padding ease-in-out .3s;
-o-transition: left ease-in-out .3s, padding ease-in-out .3s;
transition: left ease-in-out .3s, padding ease-in-out .3s;
position: absolute;
top: 0;
@ -210,7 +245,9 @@
z-index: inherit !important;
left: 0 !important;
top: 0 !important;
-webkit-transform: none !important;
transform: none !important;
-webkit-box-shadow: none !important;
box-shadow: none !important;
width: 20.205em !important;
font-size: 94%
@ -293,6 +330,8 @@
}
.flexPageTabContent.is-active {
display: -webkit-box !important;
display: -webkit-flex !important;
display: flex !important
}
@ -308,6 +347,7 @@
margin: 1.5em 0;
background: #222;
padding: .8em .8em .8em 3em;
-webkit-border-radius: .3em;
border-radius: .3em;
position: relative
}
@ -366,6 +406,7 @@
}
.itemBackdrop {
-webkit-background-size: cover;
background-size: cover;
background-repeat: no-repeat;
background-position: center;
@ -468,6 +509,7 @@
position: absolute;
top: 14.5%;
right: 10.5%;
-webkit-background-size: contain;
background-size: contain
}
@ -498,6 +540,7 @@
.itemDetailImage {
width: 100% !important;
box-shadow: 0 .0725em .29em 0 rgba(0, 0, 0, .37);
-webkit-box-shadow: 0 .0725em .29em 0 rgba(0, 0, 0, .37);
}
@media all and (max-width:62.5em) {
@ -528,8 +571,7 @@
top: 50%;
left: 50%;
margin: -2.2em 0 0 -2.2em;
border: 2.7px solid rgba(255, 255, 255, .6);
padding: .38em !important;
padding: 0.4em !important;
color: rgba(255, 255, 255, .76)
}
@ -566,6 +608,8 @@
.detailButton,
.mainDetailButtons {
display: flex;
display: -webkit-box;
display: -webkit-flex
}
.itemName {
@ -586,7 +630,10 @@
.mainDetailButtons {
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
-webkit-flex-wrap: wrap;
flex-wrap: wrap;
margin: 1em 0;
}
@ -594,6 +641,7 @@
.recordingFields button {
margin-left: 0;
margin-right: .5em;
-webkit-flex-shrink: 0;
flex-shrink: 0
}
@ -604,7 +652,11 @@
.detailButton {
display: flex;
flex-direction: column;
-webkit-box-pack: center;
-webkit-justify-content: center;
justify-content: center;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
margin: 0 !important;
padding: .5em .7em !important
@ -632,9 +684,18 @@
}
.detailButton-content {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
-webkit-box-pack: center;
-webkit-justify-content: center;
justify-content: center;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center
}
@ -706,14 +767,21 @@
}
.itemMiscInfo {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-flex-wrap: wrap;
flex-wrap: wrap;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center
}
@media all and (max-width:31.25em) {
.mobileDetails .itemMiscInfo {
text-align: center;
-webkit-box-pack: center;
-webkit-justify-content: center;
justify-content: center
}
@ -793,6 +861,7 @@
}
.btnSyncComplete i {
-webkit-border-radius: 100em;
border-radius: 100em
}
@ -801,9 +870,14 @@
}
.mediaInfoIcons {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
margin: 1em 0;
-webkit-flex-wrap: wrap;
flex-wrap: wrap
}
@ -841,6 +915,7 @@ div:not(.sectionTitleContainer-cards) > .sectionTitle-cards {
.sectionTitleButton {
margin-left: 1.5em !important;
-webkit-flex-shrink: 0;
flex-shrink: 0
}
@ -850,17 +925,22 @@ div:not(.sectionTitleContainer-cards) > .sectionTitle-cards {
.sectionTitleIconButton {
margin-left: 1.5em !important;
-webkit-flex-shrink: 0;
flex-shrink: 0;
font-size: 84% !important;
padding: .5em !important
}
.horizontalItemsContainer {
display: -webkit-box;
display: -webkit-flex;
display: flex
}
.sectionTitleTextButton {
margin: 0 !important;
display: -webkit-inline-box !important;
display: -webkit-inline-flex !important;
display: inline-flex !important;
color: inherit !important
}
@ -932,6 +1012,8 @@ div:not(.sectionTitleContainer-cards) > .sectionTitle-cards {
}
.itemsViewSettingsContainer {
-webkit-box-pack: center;
-webkit-justify-content: center;
justify-content: center
}

View file

@ -28,13 +28,17 @@
.jstree-wholerow-hovered {
background: #38c !important;
-webkit-border-radius: 0 !important;
border-radius: 0 !important;
-webkit-box-shadow: none !important;
box-shadow: none !important
}
.jstree-default .jstree-hovered {
background: 0 0 !important;
-webkit-border-radius: 0 !important;
border-radius: 0 !important;
-webkit-box-shadow: none !important;
box-shadow: none !important;
color: #fff !important
}

View file

@ -1,5 +1,6 @@
.scrollX {
overflow-x: auto;
-webkit-overflow-scrolling: touch;
overflow-y: hidden;
white-space: nowrap;
}
@ -9,11 +10,11 @@
}
.hiddenScrollX, .layout-tv .scrollX {
scrollbar-width: none;
-ms-overflow-style: none;
}
.hiddenScrollX-forced {
scrollbar-width: none;
overflow: -moz-scrollbars-none;
}
.hiddenScrollX::-webkit-scrollbar, .layout-tv .scrollX::-webkit-scrollbar {
@ -23,21 +24,25 @@
.scrollY {
overflow-y: auto;
-webkit-overflow-scrolling: touch;
overflow-x: hidden;
}
.smoothScrollY {
overflow-y: auto;
-webkit-overflow-scrolling: touch;
overflow-x: hidden;
scroll-behavior: smooth;
}
.hiddenScrollY, .layout-tv .smoothScrollY {
scrollbar-width: none;
-ms-overflow-style: none;
/* Can't do this because it not only hides the scrollbar, but also prevents scrolling */
/*overflow: -moz-scrollbars-none;*/
}
.hiddenScrollY-forced {
scrollbar-width: none;
overflow: -moz-scrollbars-none;
}
.hiddenScrollY::-webkit-scrollbar, .layout-tv .smoothScrollY::-webkit-scrollbar, .layout-tv .scrollY::-webkit-scrollbar {

View file

@ -20,12 +20,18 @@ html {
.layout-mobile,
.layout-tv {
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none
}
body {
overflow-x: hidden;
background-color: transparent !important;
-webkit-font-smoothing: antialiased
}
.mainAnimatedPage {

View file

@ -1,6 +1,9 @@
.chapterThumbTextContainer,
.videoOsdBottom {
user-select: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none
}
.osdPoster img,
@ -12,10 +15,13 @@
}
.osdHeader {
-webkit-transition: opacity .3s ease-out;
-o-transition: opacity .3s ease-out;
transition: opacity .3s ease-out;
position: relative;
z-index: 1;
background: rgba(0, 0, 0, 0.7) !important;
-webkit-backdrop-filter: none !important;
backdrop-filter: none !important;
color: #eee !important;
}
@ -29,13 +35,17 @@
}
.chapterThumbContainer {
-webkit-box-shadow: 0 0 1.9vh #000;
box-shadow: 0 0 1.9vh #000;
-webkit-box-flex: 1;
-webkit-flex-grow: 1;
flex-grow: 1;
position: relative
}
.chapterThumb {
background-position: center center;
-webkit-background-size: contain;
background-size: contain;
background-repeat: no-repeat;
border: 0;
@ -81,12 +91,20 @@
position: fixed;
background-color: rgba(0, 0, 0, 0.7);
padding: 1%;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-webkit-flex-direction: row;
flex-direction: row;
will-change: opacity;
-webkit-transition: opacity 0.3s ease-out;
-o-transition: opacity 0.3s ease-out;
transition: opacity 0.3s ease-out;
color: #fff;
user-select: none
user-select: none;
-webkit-touch-callout: none
}
.videoOsdBottom-hidden {
@ -94,35 +112,51 @@
}
.osdControls {
-webkit-box-flex: 1;
-webkit-flex-grow: 1;
flex-grow: 1
}
.videoOsdBottom .buttons {
padding: .25em 0 0;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-flex-wrap: wrap;
flex-wrap: wrap;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center
}
.osdVolumeSliderContainer {
width: 9em;
-webkit-box-flex: 1;
-webkit-flex-grow: 1;
flex-grow: 1
}
.osdMediaInfo,
.volumeButtons {
display: flex;
display: -webkit-box;
display: -webkit-flex;
align-items: center;
-webkit-box-align: center
}
.volumeButtons {
margin: 0 .5em 0 auto;
display: flex;
-webkit-align-items: center;
align-items: center
}
.osdTimeText {
margin-left: 1em;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none
}
@ -136,10 +170,15 @@
position: absolute;
height: auto;
width: 100%;
-webkit-box-shadow: 0 0 1.9vh #000;
box-shadow: 0 0 1.9vh #000;
border: .08em solid #222;
user-drag: none;
user-select: none
user-select: none;
-moz-user-select: none;
-webkit-user-drag: none;
-webkit-user-select: none;
-ms-user-select: none
}
.osdTitle,
@ -149,6 +188,7 @@
.osdMediaInfo {
display: flex;
-webkit-align-items: center;
align-items: center
}
@ -157,14 +197,23 @@
}
.osdTextContainer {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
margin-bottom: .7em;
padding-left: .5em
}
.osdMainTextContainer {
-webkit-box-align: baseline;
-webkit-align-items: baseline;
align-items: baseline
}
@ -172,13 +221,28 @@
margin-left: auto;
}
@-moz-keyframes spin {
100% {
-moz-transform: rotate(360deg);
}
}
@-webkit-keyframes spin {
100% {
-webkit-transform: rotate(360deg);
}
}
@keyframes spin {
100% {
-webkit-transform: rotate(360deg);
transform:rotate(360deg);
}
}
.osdMediaStatus .animate {
-webkit-animation:spin 4s linear infinite;
-moz-animation:spin 4s linear infinite;
animation:spin 4s linear infinite;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

View file

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

Before After
Before After