Merge remote-tracking branch 'origin/pr/1312'

master
Andrew DeMaria 5 years ago
commit 357758ba4e
No known key found for this signature in database
GPG Key ID: 0A3F5E91F8364EDF
  1. 8
      airsonic-main/src/main/resources/org/airsonic/player/theme/default_dark.properties
  2. 10
      airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
  3. 1
      airsonic-main/src/main/webapp/icons/default_dark/clear.svg
  4. 1
      airsonic-main/src/main/webapp/icons/default_dark/repeat_off.svg
  5. 1
      airsonic-main/src/main/webapp/icons/default_dark/repeat_on.svg
  6. 1
      airsonic-main/src/main/webapp/icons/default_dark/undo.svg
  7. 5
      airsonic-main/src/main/webapp/style/default-without-mediaelement.css

@ -10,7 +10,7 @@ castActiveImage = icons/default_dark/cast_active.png
castIdleImage = icons/default_dark/cast_idle.png
castPauseImage = icons/default_dark/cast_pause.png
castPlayImage = icons/default_dark/cast_play.png
clearImage = icons/default_light/clear.svg
clearImage = icons/default_dark/clear.svg
clearRatingImage = icons/default_dark/remove.png
currentImage = icons/default_dark/current.png
donateImage = icons/default_dark/donate.png
@ -40,8 +40,8 @@ ratingHalfImage = icons/default_dark/ratingHalf.png
ratingOffImage = icons/default_dark/ratingOff.png
ratingOnImage = icons/default_dark/ratingOn.png
removeImage = icons/default_dark/remove.png
repeatOff = icons/default_light/repeat_off.svg
repeatOn = icons/default_light/repeat_on.svg
repeatOff = icons/default_dark/repeat_off.svg
repeatOn = icons/default_dark/repeat_on.svg
scanningImage = icons/default_dark/spinner.gif
searchImage = icons/default_dark/search.png
settingsImage = icons/default_dark/settings.png
@ -54,7 +54,7 @@ sidebarImage = icons/default_dark/sidebar.svg
starredImage = icons/default_dark/starred.png
statusImage = icons/default_dark/status.png
statusSmallImage = icons/default_dark/status_small.png
undoImage = icons/default_light/undo.svg
undoImage = icons/default_dark/undo.svg
upImage = icons/default_dark/up.png
uploadImage = icons/default_dark/upload.png
viewAsGridImage = icons/default_dark/view_as_grid.png

@ -891,14 +891,14 @@
<td style="white-space:nowrap;">
<span class="header">
<a href="javascript:onClear()">
<a href="javascript:onClear()" class="player-control">
<img src="<spring:theme code="clearImage"/>" alt="Clear playlist" title="Clear playlist" style="cursor:pointer; height:18px">
</a>
</span> |</td>
<td style="white-space:nowrap;">
<span class="header">
<a href="javascript:onShuffle()" id="shuffleQueue">
<a href="javascript:onShuffle()" id="shuffleQueue" class="player-control">
<img src="<spring:theme code="shuffleImage"/>" alt="Shuffle" title="Shuffle" style="cursor:pointer; height:18px">
</a>
</span> |</td>
@ -906,7 +906,7 @@
<c:if test="${model.player.web or model.player.jukebox or model.player.external}">
<td style="white-space:nowrap;">
<span class="header">
<a href="javascript:onToggleRepeat()" id="repeatQueue">
<a href="javascript:onToggleRepeat()" id="repeatQueue" class="player-control">
<img id="toggleRepeat" src="<spring:theme code="repeatOn"/>" alt="Toggle repeat" title="Toggle repeat" style="cursor:pointer; height:18px">
</a>
</span> |</td>
@ -914,7 +914,7 @@
<td style="white-space:nowrap;">
<span class="header">
<a href="javascript:onUndo()" id="undoQueue">
<a href="javascript:onUndo()" id="undoQueue" class="player-control">
<img src="<spring:theme code="undoImage"/>" alt="Undo" title="Undo" style="cursor:pointer; height:18px">
</a>
</span> |</td>
@ -922,7 +922,7 @@
<c:if test="${model.user.settingsRole}">
<td style="white-space:nowrap;">
<span class="header">
<a href="playerSettings.view?id=${model.player.id}" target="main">
<a href="playerSettings.view?id=${model.player.id}" target="main" class="player-control">
<img src="<spring:theme code="settingsImage"/>" alt="Settings" title="Settings" style="cursor:pointer; height:18px">
</a>
</span> |</td>

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#cdcdcd" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-trash-2"><polyline points="3 6 5 6 21 6"></polyline><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"></path><line x1="10" y1="11" x2="10" y2="17"></line><line x1="14" y1="11" x2="14" y2="17"></line></svg>

After

Width:  |  Height:  |  Size: 444 B

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#696969" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-repeat"><polyline points="17 1 21 5 17 9"></polyline><path d="M3 11V9a4 4 0 0 1 4-4h14"></path><polyline points="7 23 3 19 7 15"></polyline><path d="M21 13v2a4 4 0 0 1-4 4H3"></path></svg>

After

Width:  |  Height:  |  Size: 388 B

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#cdcdcd" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-repeat"><polyline points="17 1 21 5 17 9"></polyline><path d="M3 11V9a4 4 0 0 1 4-4h14"></path><polyline points="7 23 3 19 7 15"></polyline><path d="M21 13v2a4 4 0 0 1-4 4H3"></path></svg>

After

Width:  |  Height:  |  Size: 388 B

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#cdcdcd" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-rotate-ccw"><polyline points="1 4 1 10 7 10"></polyline><path d="M3.51 15a9 9 0 1 0 2.13-9.36L1 10"></path></svg>

After

Width:  |  Height:  |  Size: 313 B

@ -69,6 +69,11 @@ a.disabled, a.disabled span, span.disabled {
color: #bbb;
}
/* Player controls */
a.player-control:hover {
text-decoration: none;
}
/* Color for warning messages. */
.warning {
color: red;

Loading…
Cancel
Save