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

Merge branch 'develop' into develop

Browse source
This commit is contained in:
cryptofyre 2022-04-24 23:06:34 -05:00 • committed by GitHub
commit a1108833e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 30 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/renderer/views/pages/cider-playlist.ejs
View file

@ -9,11 +9,7 @@
</template>
<template v-if="app.playlists.loadingState == 1">
<div class="playlist-display"
@mouseover.self="minClass(false)"
:style="{
'--bgColor': (data.attributes.artwork != null && data.attributes.artwork['bgColor'] != null) ? ('#' + data.attributes.artwork.bgColor) : '',
'--textColor': (data.attributes.artwork != null && data.attributes.artwork['textColor1'] != null) ? ('#' + data.attributes.artwork.textColor1) : ''
}">
@mouseover.self="minClass(false)">
<div class="playlistInfo">
<div class="row">
<div class="col-auto flex-center" @mouseover="minClass(false)">

2
src/renderer/views/pages/themes-github.ejs
View file

@ -15,7 +15,7 @@
</div>
<div class="col-auto flex-center">
<button class="md-btn md-btn-small md-btn-block" @click="openThemesFolder()">
Open Themes Folder
{{$root.getLz('settings.option.visual.theme.github.openfolder')}}
</button>
</div>
<div class="col-auto nopadding flex-center">