Merge branch 'master' into music-metadata

2018-02-19 20:22:22 +01:00
parent 070d3ff242 474654fd16
commit 23d37d7da1
11 changed files with 60 additions and 60 deletions
--- a/src/renderer/pages/player-page.js
+++ b/src/renderer/pages/player-page.js
@@ -534,9 +534,9 @@ function renderPlayerControls (state) {
  const volume = state.playing.volume
  const volumeIcon = 'volume_' + (
    volume === 0 ? 'off'
-    : volume < 0.3 ? 'mute'
-    : volume < 0.6 ? 'down'
-    : 'up')
+      : volume < 0.3 ? 'mute'
+        : volume < 0.6 ? 'down'
+          : 'up')
  const volumeStyle = {
    background: '-webkit-gradient(linear, left top, right top, ' +
      'color-stop(' + (volume * 100) + '%, #eee), ' +