From 09808b170edb84e15f0918831ab9a62e6bbb364e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Thomas?= Date: Sat, 12 Oct 2019 00:49:08 +0200 Subject: [PATCH 1/2] Update dark icons for the 'groove' theme --- .../org/airsonic/player/theme/default_dark.properties | 8 ++++---- .../src/main/webapp/icons/default_dark/clear.svg | 1 + .../src/main/webapp/icons/default_dark/repeat_off.svg | 1 + .../src/main/webapp/icons/default_dark/repeat_on.svg | 1 + airsonic-main/src/main/webapp/icons/default_dark/undo.svg | 1 + 5 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 airsonic-main/src/main/webapp/icons/default_dark/clear.svg create mode 100644 airsonic-main/src/main/webapp/icons/default_dark/repeat_off.svg create mode 100644 airsonic-main/src/main/webapp/icons/default_dark/repeat_on.svg create mode 100644 airsonic-main/src/main/webapp/icons/default_dark/undo.svg diff --git a/airsonic-main/src/main/resources/org/airsonic/player/theme/default_dark.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/default_dark.properties index bf8c9e6e..de14281c 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/theme/default_dark.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/theme/default_dark.properties @@ -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 diff --git a/airsonic-main/src/main/webapp/icons/default_dark/clear.svg b/airsonic-main/src/main/webapp/icons/default_dark/clear.svg new file mode 100644 index 00000000..a4c52d25 --- /dev/null +++ b/airsonic-main/src/main/webapp/icons/default_dark/clear.svg @@ -0,0 +1 @@ + diff --git a/airsonic-main/src/main/webapp/icons/default_dark/repeat_off.svg b/airsonic-main/src/main/webapp/icons/default_dark/repeat_off.svg new file mode 100644 index 00000000..b9c2d051 --- /dev/null +++ b/airsonic-main/src/main/webapp/icons/default_dark/repeat_off.svg @@ -0,0 +1 @@ + diff --git a/airsonic-main/src/main/webapp/icons/default_dark/repeat_on.svg b/airsonic-main/src/main/webapp/icons/default_dark/repeat_on.svg new file mode 100644 index 00000000..c3d13ede --- /dev/null +++ b/airsonic-main/src/main/webapp/icons/default_dark/repeat_on.svg @@ -0,0 +1 @@ + diff --git a/airsonic-main/src/main/webapp/icons/default_dark/undo.svg b/airsonic-main/src/main/webapp/icons/default_dark/undo.svg new file mode 100644 index 00000000..7db076bf --- /dev/null +++ b/airsonic-main/src/main/webapp/icons/default_dark/undo.svg @@ -0,0 +1 @@ + From 6b2c7e338d628d327ed53ac6a9d4fdcc24e69ab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Thomas?= Date: Sat, 12 Oct 2019 00:59:04 +0200 Subject: [PATCH 2/2] Remove white underline from player controls --- .../src/main/webapp/WEB-INF/jsp/playQueue.jsp | 10 +++++----- .../main/webapp/style/default-without-mediaelement.css | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp index bdc21627..6142d7da 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp @@ -891,14 +891,14 @@ - + " alt="Clear playlist" title="Clear playlist" style="cursor:pointer; height:18px"> | - + " alt="Shuffle" title="Shuffle" style="cursor:pointer; height:18px"> | @@ -906,7 +906,7 @@ - + " alt="Toggle repeat" title="Toggle repeat" style="cursor:pointer; height:18px"> | @@ -914,7 +914,7 @@ - + " alt="Undo" title="Undo" style="cursor:pointer; height:18px"> | @@ -922,7 +922,7 @@ - + " alt="Settings" title="Settings" style="cursor:pointer; height:18px"> | diff --git a/airsonic-main/src/main/webapp/style/default-without-mediaelement.css b/airsonic-main/src/main/webapp/style/default-without-mediaelement.css index 1e8f5b79..5acea753 100644 --- a/airsonic-main/src/main/webapp/style/default-without-mediaelement.css +++ b/airsonic-main/src/main/webapp/style/default-without-mediaelement.css @@ -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;