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

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

Browse source 
# Resolve Conflicts:
#	src/assets/css/librarybrowser.css
#	src/itemdetails.html
This commit is contained in:
grafixeyehero 2020-01-30 20:11:40 +03:00
commit b06afa3305
247 changed files with 5884 additions and 3079 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/components/listview/listview.css
View file

@ -10,7 +10,7 @@
display: block;
align-items: center;
text-align: left;
padding: .25em .25em .25em .5em;
padding: 0.25em 0.25em 0.25em 0.5em;
cursor: pointer;
overflow: hidden;
}
@ -50,14 +50,18 @@
}
.listItem-border.show-focus:focus {
transform: scale(1.0) !important;
transform: scale(1) !important;
}
.listItemImage, .listItemIcon, .listItemAside {
.listItemImage,
.listItemIcon,
.listItemAside {
flex-shrink: 0;
}
.listItemBody, .listItemImage, .listItemIcon {
.listItemBody,
.listItemImage,
.listItemIcon {
display: inline-block;
vertical-align: middle;
}
@ -71,13 +75,13 @@
}
.listViewDragHandle {
margin-left: -.25em !important;
margin-left: -0.25em !important;
touch-action: none;
}
.listItemBody {
flex-grow: 1;
padding: .85em .75em;
padding: 0.85em 0.75em;
overflow: hidden;
text-overflow: ellipsis;
flex-direction: column;
@ -85,8 +89,15 @@
justify-content: center;
}
.listItem,
.listItemBody,
.listItemMediaInfo {
display: flex;
contain: layout style;
}
.layout-tv .listItemBody {
padding: .35em .75em;
padding: 0.35em 0.75em;
}
.listItemBody-noleftpadding {
@ -95,7 +106,7 @@
.listItemBodyText {
margin: 0;
padding: .1em 0;
padding: 0.1em 0;
overflow: hidden;
text-overflow: ellipsis;
}
@ -121,7 +132,7 @@
width: 19.5vw;
height: 13vw;
background-position: center center;
margin-right: .75em;
margin-right: 0.75em;
}
.listItemImageButton {
@ -162,13 +173,13 @@
}
.listItemBody {
padding-left: .75em;
padding-left: 0.75em;
}
}
@media all and (max-width: 50em) {
.listItemBody {
padding-right: .5em;
padding-right: 0.5em;
}
}
@ -181,15 +192,15 @@
width: 1em !important;
height: 1em !important;
font-size: 143%;
padding: 0 .25em 0 0;
padding: 0 0.25em 0 0;
}
.listItemIcon:not(.listItemIcon-transparent) {
background-color: #00a4dc;
color: #fff;
padding: .5em;
padding: 0.5em;
border-radius: 100em;
margin: 0 .2em 0 .4em;
margin: 0 0.2em 0 0.4em;
}
.listItemProgressBar {
@ -200,7 +211,7 @@
}
.listItem:focus {
border-radius: .2em;
border-radius: 0.2em;
}
.listItem:focus .secondary {
@ -208,7 +219,7 @@
}
.listItem-focusscale {
transition: transform .2s ease-out;
transition: transform 0.2s ease-out;
}
.listItem-focusscale:focus {
@ -216,7 +227,7 @@
}
.paperList {
margin: .5em auto;
margin: 0.5em auto;
}
.paperList-clear {
@ -235,26 +246,23 @@
}
.listItemIndicators {
right: .324em;
top: .324em;
right: 0.324em;
top: 0.324em;
position: absolute;
display: flex;
align-items: center;
}
.listItem, .listItemBody, .listItemMediaInfo {
display: flex;
contain: layout style;
}
.listItem-bottomoverview {
font-size: 88%;
margin-bottom: 1em;
margin-top: .2em;
margin-top: 0.2em;
}
@media all and (max-width: 50em) {
.listItem .endsAt, .listItem .criticRating, .listItem-overview {
.listItem .endsAt,
.listItem .criticRating,
.listItem-overview {
display: none !important;
}
}

18
src/components/listview/listview.js
View file

@ -160,7 +160,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
var button = options.rightButtons[i];
html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="custom" data-customaction="' + button.id + '" title="' + button.title + '"><i class="md-icon">' + button.icon + '</i></button>';
html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="custom" data-customaction="' + button.id + '" title="' + button.title + '"><i class="material-icons">' + button.icon + '</i></button>';
}
return html;
@ -262,9 +262,9 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
}
if (!clickEntireItem && options.dragHandle) {
//html += '<button is="paper-icon-button-light" class="listViewDragHandle listItemButton"><i class="md-icon">drag_handle</i></button>';
//html += '<button is="paper-icon-button-light" class="listViewDragHandle listItemButton"><i class="material-icons">drag_handle</i></button>';
// Firefox and Edge are not allowing the button to be draggable
html += '<i class="listViewDragHandle md-icon listItemIcon listItemIcon-transparent">drag_handle</i>';
html += '<i class="listViewDragHandle material-icons listItemIcon listItemIcon-transparent">drag_handle</i>';
}
if (options.image !== false) {
@ -298,7 +298,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
}
if (playOnImageClick) {
html += '<button is="paper-icon-button-light" class="listItemImageButton itemAction" data-action="resume"><i class="md-icon listItemImageButton-icon">play_arrow</i></button>';
html += '<button is="paper-icon-button-light" class="listItemImageButton itemAction" data-action="resume"><i class="material-icons listItemImageButton-icon">play_arrow</i></button>';
}
var progressHtml = indicators.getProgressBarHtml(item, {
@ -476,15 +476,15 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
if (!clickEntireItem) {
if (options.addToListButton) {
html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="addtoplaylist"><i class="md-icon">playlist_add</i></button>';
html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="addtoplaylist"><i class="material-icons">playlist_add</i></button>';
}
if (options.moreButton !== false) {
html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="menu"><i class="md-icon">' + moreIcon + '</i></button>';
html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="menu"><i class="material-icons">' + moreIcon + '</i></button>';
}
if (options.infoButton) {
html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="link"><i class="md-icon">info_outline</i></button>';
html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="link"><i class="material-icons">info_outline</i></button>';
}
if (options.rightButtons) {
@ -497,11 +497,11 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
var likes = userData.Likes == null ? '' : userData.Likes;
if (itemHelper.canMarkPlayed(item)) {
html += '<button is="emby-playstatebutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><i class="md-icon">check</i></button>';
html += '<button is="emby-playstatebutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><i class="material-icons">check</i></button>';
}
if (itemHelper.canRate(item)) {
html += '<button is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><i class="md-icon">favorite</i></button>';
html += '<button is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><i class="material-icons">favorite</i></button>';
}
}
}