Merge remote-tracking branch 'upstream/master' into details-redux
This commit is contained in:
commit
9c4a602979
81 changed files with 2690 additions and 754 deletions
|
@ -7,8 +7,8 @@
|
|||
<div class="detailPagePrimaryContainer padded-left padded-right">
|
||||
<div class="infoWrapper infoText">
|
||||
<div class="nameContainer"></div>
|
||||
<div class="itemMiscInfo itemMiscInfo-primary"></div>
|
||||
<div class="itemMiscInfo itemMiscInfo-secondary"></div>
|
||||
<div class="itemMiscInfo itemMiscInfo-primary" style="margin-bottom: 0.6em"></div>
|
||||
<div class="itemMiscInfo itemMiscInfo-secondary" style="margin-bottom: 0.6em"></div>
|
||||
</div>
|
||||
|
||||
<div class="mainDetailButtons">
|
||||
|
|
|
@ -429,6 +429,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
|
|||
} else if (item.Album) {
|
||||
parentNameHtml.push(item.Album);
|
||||
}
|
||||
|
||||
// FIXME: This whole section needs some refactoring, so it becames easier to scale across all form factors. See GH #1022
|
||||
var html = '';
|
||||
var tvShowHtml = parentNameHtml[0];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue