cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 19:08:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix layout also for desktop

Browse Source
This commit is contained in:
ferferga 2020-04-05 00:59:37 +02:00
parent 4db414fb68
commit a06a0e9515
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/assets/css/librarybrowser.css
View File

@ -518,6 +518,12 @@
margin: 0.5em 0; margin: 0.5em 0;
} }
.nameContainer {
display: flex;
flex-direction: column;
flex-wrap: wrap;
}
.itemMiscInfo { .itemMiscInfo {
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
@ -529,10 +535,6 @@
align-items: center; align-items: center;
} }
.parentName > a:nth-child(3) {
font-size: 0.7em;
}
.layout-mobile .parentName, .layout-mobile .parentName,
.layout-mobile .itemName, .layout-mobile .itemName,
.layout-mobile .itemMiscInfo, .layout-mobile .itemMiscInfo,
@ -578,7 +580,6 @@
.infoText { .infoText {
white-space: nowrap; white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
text-align: left; text-align: left;
} }

20
src/controllers/itemdetailpage.js
View File

@ -336,7 +336,6 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "userSetti
return html = html.join(" / "); return html = html.join(" / ");
} }
// TODO: Clean this and the CSS rules for mobile layout. See #1022
function renderName(item, container, isStatic, context) { function renderName(item, container, isStatic, context) {
var parentRoute; var parentRoute;
var parentNameHtml = []; var parentNameHtml = [];
@ -406,9 +405,18 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "userSetti
if (parentNameHtml.length) { if (parentNameHtml.length) {
if (parentNameLast) { if (parentNameLast) {
html = '<h3 class="parentName" style="margin: .25em 0;">' + parentNameHtml.join("</br>") + "</h3>"; // Music
if (layoutManager.mobile) {
html = '<h3 class="parentName" style="margin: .25em 0;">' + parentNameHtml.join("</br>") + "</h3>";
} else {
html = '<h3 class="parentName" style="margin: .25em 0;">' + parentNameHtml.join(" - ") + "</h3>";
}
} else { } else {
html = '<h1 class="parentName" style="margin: .1em 0 .25em;">' + parentNameHtml.join("</br>") + "</h1>"; if (layoutManager.mobile) {
html = '<h1 class="parentName" style="margin: .1em 0 .25em;">' + parentNameHtml.join("</br>") + "</h1>";
} else {
html = '<h1 class="parentName" style="margin: .1em 0 .25em;">' + parentNameHtml[0] + "</h1>";
}
} }
} }
@ -418,7 +426,11 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "userSetti
var offset = parentNameLast ? ".25em" : ".5em"; var offset = parentNameLast ? ".25em" : ".5em";
if (html && !parentNameLast) { if (html && !parentNameLast) {
html += '<h3 class="itemName infoText" style="margin: .25em 0 .5em;">' + name + '</h3>'; if (!layoutManager.mobile && parentNameHtml[1]) {
html += '<h3 class="itemName infoText" style="margin: .25em 0 .5em; font-weight: 600;">' + parentNameHtml[1] + ' - ' + name + '</h3>';
} else {
html += '<h3 class="itemName infoText" style="margin: .25em 0 .5em;">' + name + '</h3>';
}
} else { } else {
html = '<h1 class="itemName infoText" style="margin: .1em 0 ' + offset + ';">' + name + "</h1>" + html; html = '<h1 class="itemName infoText" style="margin: .1em 0 ' + offset + ';">' + name + "</h1>" + html;
} }