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

change shape to overflow

Browse source
This commit is contained in:
grafixeyehero 2020-01-13 21:15:59 +03:00
parent 44ca739cba
commit 442487799a
4 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/assets/css/librarybrowser.css
View file

@ -413,11 +413,14 @@
align-items: center; align-items: center;
align-content: center; align-content: center;
position: sticky; position: sticky;
background-color: #101010;
top: 0; top: 0;
z-index: 2; z-index: 2;
} }
.detailSticky {
background-color: #101010;
}
.infoWrapper { .infoWrapper {
flex: 1 0 0; flex: 1 0 0;
} }
@ -431,6 +434,9 @@
.detailPageSecondaryContainer { .detailPageSecondaryContainer {
margin: 1.25em 0; margin: 1.25em 0;
}
.detailPageContent {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding-left: 2%; padding-left: 2%;
@ -443,7 +449,6 @@
} }
.detailImageContainer { .detailImageContainer {
margin: 1.25em 0;
position: sticky; position: sticky;
top: 15%; top: 15%;
float: left; float: left;
@ -452,7 +457,6 @@
.detailPagePrimaryContent { .detailPagePrimaryContent {
position: relative; position: relative;
flex-grow: 1
} }
.detailLogo { .detailLogo {
@ -494,7 +498,7 @@
} }
@media all and (max-width:62.5em) { @media all and (max-width:62.5em) {
.detailPageContent { .detailPageWrapperContainer {
position: relative position: relative
} }
@ -705,13 +709,13 @@
margin-bottom: 3.4em !important margin-bottom: 3.4em !important
} }
.detailPageContent { .detailPageWrapperContainer {
border-spacing: 0; border-spacing: 0;
border-collapse: collapse; border-collapse: collapse;
} }
@media all and (max-width:62.5em) { @media all and (max-width:62.5em) {
.detailPageContent-nodetailimg { .detailPageWrapperContainer-nodetailimg {
padding-top: 0; padding-top: 0;
} }
} }

5
src/controllers/itemdetailpage.js
View file

@ -524,6 +524,7 @@ define(["loading", "appRouter", "layoutManager", "userSettings", "connectionMana
function reloadFromItem(instance, page, params, item, user) { function reloadFromItem(instance, page, params, item, user) {
var context = params.context; var context = params.context;
page.querySelector(".detailPagePrimaryContainer").classList.add("detailSticky");
renderName(item, page.querySelector(".nameContainer"), false, context); renderName(item, page.querySelector(".nameContainer"), false, context);
var apiClient = connectionManager.getApiClient(item.ServerId); var apiClient = connectionManager.getApiClient(item.ServerId);
renderSeriesTimerEditor(page, item, apiClient, user); renderSeriesTimerEditor(page, item, apiClient, user);
@ -743,9 +744,9 @@ define(["loading", "appRouter", "layoutManager", "userSettings", "connectionMana
if ("Person" !== item.Type) { if ("Person" !== item.Type) {
elem.classList.add("detailimg-hidemobile"); elem.classList.add("detailimg-hidemobile");
page.querySelector(".detailPageContent").classList.add("detailPageContent-nodetailimg"); page.querySelector(".detailPageWrapperContainer").classList.add("detailPageWrapperContainer-nodetailimg");
} else { } else {
page.querySelector(".detailPageContent").classList.remove("detailPageContent-nodetailimg"); page.querySelector(".detailPageWrapperContainer").classList.remove("detailPageWrapperContainer-nodetailimg");
} }
var imageTags = item.ImageTags || {}; var imageTags = item.ImageTags || {};

4
src/itemdetails.html
View file

@ -6,7 +6,7 @@
</div> </div>
<div class="detailLogo"></div> <div class="detailLogo"></div>
<div class="detailPageWrapperContainer"> <div class="detailPageWrapperContainer padded-bottom-page">
<div class="detailPagePrimaryContainer padded-left padded-right"> <div class="detailPagePrimaryContainer padded-left padded-right">
<div class="infoWrapper infoText"> <div class="infoWrapper infoText">
<div class="nameContainer"></div> <div class="nameContainer"></div>
@ -107,8 +107,8 @@
</button> </button>
</div> </div>
</div> </div>
<div class="detailImageContainer verticalSection-extrabottompadding padded-left"></div>
<div class="detailPageSecondaryContainer"> <div class="detailPageSecondaryContainer">
<div class="detailImageContainer padded-left"></div>
<div class="detailPageContent"> <div class="detailPageContent">
<div class="detailPagePrimaryContent padded-left padded-right"> <div class="detailPagePrimaryContent padded-left padded-right">
<div class="detailSection" style="margin-bottom: 0;"> <div class="detailSection" style="margin-bottom: 0;">

16
src/scripts/itembynamedetailpage.js
View file

@ -99,7 +99,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
Limit: 10, Limit: 10,
SortBy: "StartDate" SortBy: "StartDate"
}, { }, {
shape: "backdrop", shape: "overflowBackdrop",
showTitle: true, showTitle: true,
centerText: true, centerText: true,
overlayMoreButton: true, overlayMoreButton: true,
@ -121,7 +121,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
Limit: 10, Limit: 10,
SortBy: "SortName" SortBy: "SortName"
}, { }, {
shape: "portrait", shape: "overflowPortrait",
showTitle: true, showTitle: true,
centerText: true, centerText: true,
overlayMoreButton: true, overlayMoreButton: true,
@ -140,7 +140,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
Limit: 10, Limit: 10,
SortBy: "SortName" SortBy: "SortName"
}, { }, {
shape: "portrait", shape: "overflowPortrait",
showTitle: true, showTitle: true,
centerText: true, centerText: true,
overlayPlayButton: true overlayPlayButton: true
@ -157,7 +157,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
Limit: 10, Limit: 10,
SortBy: "SortName" SortBy: "SortName"
}, { }, {
shape: "portrait", shape: "overflowPortrait",
showTitle: true, showTitle: true,
centerText: true, centerText: true,
overlayPlayButton: true overlayPlayButton: true
@ -174,7 +174,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
Limit: 10, Limit: 10,
SortBy: "SortName" SortBy: "SortName"
}, { }, {
shape: "portrait", shape: "overflowPortrait",
showTitle: true, showTitle: true,
centerText: true, centerText: true,
overlayMoreButton: true overlayMoreButton: true
@ -191,7 +191,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
SortOrder: "Descending", SortOrder: "Descending",
SortBy: "ProductionYear,Sortname" SortBy: "ProductionYear,Sortname"
}, { }, {
shape: "square", shape: "overflowSquare",
playFromHere: true, playFromHere: true,
showTitle: true, showTitle: true,
showYear: true, showYear: true,
@ -211,7 +211,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
Limit: 8, Limit: 8,
SortBy: "SortName" SortBy: "SortName"
}, { }, {
shape: "square", shape: "overflowSquare",
playFromHere: true, playFromHere: true,
showTitle: true, showTitle: true,
showParentTitle: true, showParentTitle: true,
@ -231,7 +231,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
Limit: 6, Limit: 6,
SortBy: "SortName" SortBy: "SortName"
}, { }, {
shape: "backdrop", shape: "overflowBackdrop",
showTitle: true, showTitle: true,
showParentTitle: true, showParentTitle: true,
centerText: true, centerText: true,