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

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

# Conflicts:
#	src/assets/css/librarybrowser.css
#	src/itemdetails.html
This commit is contained in:
grafixeyehero 2020-01-23 20:51:30 +03:00
commit 709b48a8a8
129 changed files with 2629 additions and 1199 deletions

View file

@ -45,7 +45,7 @@
<button is="emby-button" type="button" class="button-flat btnInstantMix hide detailButton">
<div class="detailButton-content">
<i class="md-icon detailButton-icon">shuffle</i>
<i class="md-icon detailButton-icon">explore</i>
<div class="detailButton-text">${HeaderInstantMix}</div>
</div>
</button>