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

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
child_duckling 2022-03-04 22:54:32 -08:00
commit d533c4a396
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/renderer/less/bootstrap.less vendored
View file

@ -7605,6 +7605,9 @@ fieldset:disabled .btn {
text-align : center; text-align : center;
background-color: #000; background-color: #000;
border-radius : 0.25rem; border-radius : 0.25rem;
-webkit-user-select: none;
user-select: none;
pointer-events: none;
} }
.popover { .popover {

2
src/renderer/main/vueapp.js
View file

@ -3533,7 +3533,7 @@ const app = new Vue({
return event.deltaY < 0; return event.deltaY < 0;
}, },
volumeUp() { volumeUp() {
if ((app.mk.volume + app.cfg.audio.volumeStep) > 1) { if ((app.mk.volume + app.cfg.audio.volumeStep) > app.cfg.audio.maxVolume) {
app.mk.volume = app.cfg.audio.maxVolume; app.mk.volume = app.cfg.audio.maxVolume;
console.log('setting max volume') console.log('setting max volume')
} else { } else {