okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #136 from ciderapp/main

Browse source 
merge from main
This commit is contained in:
vapormusic 2022-01-16 08:45:19 +07:00 • committed by GitHub
commit f87f110525
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 84 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/renderer/views/components/queue.ejs
View file

@ -5,7 +5,7 @@
<h3 class="queue-header-text">Queue</h3>
</div>
<div class="col-auto flex-center">
<button class="autoplay" :style="{'background': app.mk.autoplayEnabled ? 'var(--keyColor)' : ''}" @click="app.mk.autoplayEnabled = !app.mk.autoplayEnabled">AUTO</button>
<button class="autoplay" :style="{'background': app.mk.autoplayEnabled ? 'var(--keyColor)' : ''}" @click="app.mk.autoplayEnabled = !app.mk.autoplayEnabled">∞</button>
</div>
</div>
<div class="queue-body">

9
src/renderer/views/main.ejs
View file

@ -142,8 +142,11 @@
@click="invokeDrawer('queue')"></button>
</div>
<div class="app-chrome-item generic">
<button class="playback-button--small lyrics" :class="{'active': drawer.panel == 'lyrics'}"
<template v-if="lyrics && lyrics != [] && lyrics.length > 0">
<button class="playback-button--small lyrics" :class="{'active': drawer.panel == 'lyrics'}"
@click="invokeDrawer('lyrics')"></button>
</template>
</div>
<div class="app-chrome-item full-height" v-if="chrome.windowControlPosition == 'right'">
<div class="window-controls">
@ -517,7 +520,7 @@
</div>
<transition name="drawertransition">
<div class="app-drawer" v-if="drawer.open && drawer.panel == 'lyrics'">
<div class="app-drawer" v-if="drawer.open && drawer.panel == 'lyrics' && lyrics && lyrics != [] && lyrics.length > 0">
<div class="bgArtworkMaterial">
<div class="bg-artwork-container">
<img class="bg-artwork a" :src="$store.state.artwork.playerLCD">
@ -708,4 +711,4 @@
<script src="https://cdn.jsdelivr.net/npm/resonance-audio/build/resonance-audio.min.js"></script>
<script src="/audio/audio.js?v=1"></script>
</body>
</html>
</html>