Merge branch 'upcoming' into fuck-git

This commit is contained in:
cryptofyre 2022-01-18 21:25:30 -06:00 committed by GitHub
commit 03e771fed1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
64 changed files with 6305 additions and 2036 deletions

View file

@ -115,11 +115,11 @@
</div>
</div>
<template v-if="mk.nowPlayingItem['attributes']['playParams']">
<div class="actions"
v-if="isInLibrary(mk.nowPlayingItem['attributes']['playParams'])">
❤️
<div class="actions">
<button class="lcdMenu" @click="nowPlayingContextMenu">
<div class="svg-icon"></div>
</button>
</div>
<div class="actions" v-else>🖤</div>
</template>
</div>
@ -661,6 +661,8 @@
</button>
</script>
<!-- Artwork Material -->
<%- include('components/artwork-material') %>
<!-- Menu Panel -->
<%- include('components/menu-panel') %>
<!-- Playlist Listing -->
@ -712,5 +714,6 @@
<script src="index.js?v=1"></script>
<script src="https://cdn.jsdelivr.net/npm/resonance-audio/build/resonance-audio.min.js"></script>
<script src="/audio/audio.js?v=1"></script>
<script src="/WSAPI_Interop.js"></script>
</body>
</html>