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 pull request #813 from MrTimscampi/icons

Browse source 
Add more icon types
This commit is contained in:
dkanada 2020-02-16 10:45:59 +09:00 • committed by GitHub
commit 18aa3e31e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CONTRIBUTORS.md
View file

@ -33,6 +33,7 @@
- [Daniel Hartung](https://github.com/dhartung) - [Daniel Hartung](https://github.com/dhartung)
- [Ryan Hartzell](https://github.com/ryan-hartzell) - [Ryan Hartzell](https://github.com/ryan-hartzell)
- [Thibault Nocchi](https://github.com/ThibaultNocchi) - [Thibault Nocchi](https://github.com/ThibaultNocchi)
- [MrTimscampi](https://github.com/MrTimscampi)
# Emby Contributors # Emby Contributors

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

@ -522,6 +522,7 @@
.layout-tv .detailPagePrimaryContainer { .layout-tv .detailPagePrimaryContainer {
position: relative; position: relative;
top: 0;
} }
.detailSticky { .detailSticky {

4
src/components/cardbuilder/card.css
View file

@ -370,8 +370,8 @@ button::-moz-focus-inner {
text-align: center; text-align: center;
} }
.cardImageIcon { .cardImageContainer .cardImageIcon {
font-size: 5em !important; font-size: 5em;
color: inherit; color: inherit;
} }

4
src/components/cardbuilder/cardBuilder.js
View file

@ -1500,6 +1500,10 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
return '<i class="cardImageIcon material-icons">movie</i>' return '<i class="cardImageIcon material-icons">movie</i>'
case 'Series': case 'Series':
return '<i class="cardImageIcon material-icons">tv</i>' return '<i class="cardImageIcon material-icons">tv</i>'
case 'Book':
return '<i class="cardImageIcon material-icons">book</i>'
case 'Folder':
return '<i class="cardImageIcon material-icons">folder</i>'
} }
if (options && options.defaultCardImageIcon) { if (options && options.defaultCardImageIcon) {

5
src/components/indicators/indicators.js
View file

@ -152,9 +152,12 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun
if (item.Type === 'Video') { if (item.Type === 'Video') {
return '<div class="indicator videoIndicator"><i class="material-icons indicatorIcon">videocam</i></div>'; return '<div class="indicator videoIndicator"><i class="material-icons indicatorIcon">videocam</i></div>';
} }
if (item.Type === 'Folder' || item.Type === 'PhotoAlbum') { if (item.Type === 'Folder') {
return '<div class="indicator videoIndicator"><i class="material-icons indicatorIcon">folder</i></div>'; return '<div class="indicator videoIndicator"><i class="material-icons indicatorIcon">folder</i></div>';
} }
if (item.Type === 'PhotoAlbum') {
return '<div class="indicator videoIndicator"><i class="material-icons indicatorIcon photo_album"></i></div>';
}
if (item.Type === 'Photo') { if (item.Type === 'Photo') {
return '<div class="indicator videoIndicator"><i class="material-icons indicatorIcon">photo</i></div>'; return '<div class="indicator videoIndicator"><i class="material-icons indicatorIcon">photo</i></div>';
} }