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

Merge branch 'upcoming' of https://github.com/ciderapp/Cider into upcoming

Browse source
This commit is contained in:
vapormusic 2022-01-28 21:42:25 +07:00
commit 7aeff80ce4
6 changed files with 50 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,11 +62,11 @@
</div>
</template>
<div class="playlist-controls" v-observe-visibility="{callback: isHeaderVisible}">
<button class="md-btn md-btn-icon" style="min-width: 100px;"
<button class="md-btn md-btn-primary md-btn-icon" style="min-width: 100px;"
@click="app.mk.shuffleMode = 0; play()"> <img class="md-ico-play">
{{app.getLz('term.play')}}
</button>
<button class="md-btn md-btn-icon" style="min-width: 100px;"
<button class="md-btn md-btn-primary md-btn-icon" style="min-width: 100px;"
@click="app.mk.shuffleMode = 1;play()"> <img class="md-ico-shuffle">
{{app.getLz('term.shuffle')}}
</button>
@ -98,11 +98,11 @@
</div>
<div class="col-auto flex-center">
<div>
<button class="md-btn md-btn-icon" style="min-width: 100px;"
<button class="md-btn md-btn-primary md-btn-icon" style="min-width: 100px;"
@click="app.mk.shuffleMode = 0; play()"> <img class="md-ico-play">
{{app.getLz('term.play')}}
</button>
<button class="md-btn md-btn-icon" style="min-width: 100px;"
<button class="md-btn md-btn-primary md-btn-icon" style="min-width: 100px;"
@click="app.mk.shuffleMode = 1;play()"> <img class="md-ico-shuffle">
{{app.getLz('term.shuffle')}}
</button>

15
src/renderer/views/pages/settings.ejs
View file

@ -40,9 +40,10 @@
<div class="md-option-segment">
{{$root.getLz('term.equalizer')}}
</div>
<div class="md-option-segment md-btn md-option-segment_auto">
<label class="list-button list-element"
onclick="app.modals.equalizer = true">{{$root.getLz('term.equalizer')}}</label>
<div class="md-option-segment md-option-segment_auto">
<button class="md-btn" onclick="app.modals.equalizer = true">
{{$root.getLz('term.equalizer')}}
</button>
</div>
</div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext">
@ -475,9 +476,11 @@
<div class="md-option-segment">
{{$root.getLz('settings.option.connectivity.lastfmScrobble')}}
</div>
<div class="md-option-segment md-btn md-option-segment_auto">
<label class="list-button list-element" id="lfmConnect" ref="lfmConnect"
onclick="app.LastFMAuthenticate()">{{$root.getLz('term.connect')}}</label>
<div class="md-option-segment md-option-segment_auto">
<button class="md-btn" id="lfmConnect" ref="lfmConnect"
onclick="app.LastFMAuthenticate()">
{{$root.getLz('term.connect')}}
</button>
</div>
</div>
<div class="md-option-line" v-show ="app.cfg.lastfm.enabled">