From 9a7ef6fd5b48d6ad3a88744ed4a1d6725615a611 Mon Sep 17 00:00:00 2001 From: GilbN Date: Fri, 29 Mar 2024 13:01:54 +0100 Subject: [PATCH 1/8] Unraid: Modal bg fix for #548 --- css/base/unraid/unraid-base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/base/unraid/unraid-base.css b/css/base/unraid/unraid-base.css index 86244a76..ead2bc3c 100644 --- a/css/base/unraid/unraid-base.css +++ b/css/base/unraid/unraid-base.css @@ -675,7 +675,7 @@ div.shade-black { /* MODAL */ .sweet-alert, .sweet-alert .sa-icon.sa-success .sa-fix { - background-color: var(--modal-bg-color); + background: var(--modal-bg-color); } .sweet-alert.nchan h2 { From 8c3c457a9842c2f2a09601c241cb62244a7068ec Mon Sep 17 00:00:00 2001 From: Marius <24592972+gilbN@users.noreply.github.com> Date: Wed, 10 Apr 2024 21:04:03 +0200 Subject: [PATCH 2/8] Add QBITTORRENT_VERSION env to qbit mod --- .../root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 634b19ab..9aba5e3d 100755 --- a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -31,6 +31,7 @@ echo -e "Variables set:\\n\ 'TP_DOMAIN'=${TP_DOMAIN}\\n\ 'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\ 'TP_SCHEME'=${TP_SCHEME}\\n\ +'QBITTORRENT_VERSION'=${QBITTORRENT_VERSION}\\n\ 'TP_THEME'=${TP_THEME}\\n" # Set default @@ -66,7 +67,11 @@ if [[ ! -d /themepark ]]; then echo '| Downloading WebUI files from github |' echo '---------------------------------------' printf '\nDownloading qBittorrent to /temp\n' - git clone --depth 1 https://github.com/qbittorrent/qBittorrent /temp + if [[ -n ${QBITTORRENT_VERSION} ]]; then + git clone --depth 1 release-${QBITTORRENT_VERSION} https://github.com/qbittorrent/qBittorrent /temp + else + git clone --depth 1 https://github.com/qbittorrent/qBittorrent /temp + fi printf '\nDownload finished\n\n' cp -a /temp/src/webui/www /themepark cp -a /temp/src/icons/. /themepark/public/icons From 91b89adaf8896839b9c80fa663aec65a2afb842d Mon Sep 17 00:00:00 2001 From: Marius <24592972+gilbN@users.noreply.github.com> Date: Wed, 10 Apr 2024 21:10:14 +0200 Subject: [PATCH 3/8] add -b --- .../root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 9aba5e3d..1e8ffd05 100755 --- a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -68,7 +68,7 @@ if [[ ! -d /themepark ]]; then echo '---------------------------------------' printf '\nDownloading qBittorrent to /temp\n' if [[ -n ${QBITTORRENT_VERSION} ]]; then - git clone --depth 1 release-${QBITTORRENT_VERSION} https://github.com/qbittorrent/qBittorrent /temp + git clone --depth 1 -b release-${QBITTORRENT_VERSION} https://github.com/qbittorrent/qBittorrent /temp else git clone --depth 1 https://github.com/qbittorrent/qBittorrent /temp fi From 90b00dd34da9e05571d5d6da745113ea6c659c1a Mon Sep 17 00:00:00 2001 From: GilbN Date: Sun, 14 Apr 2024 16:15:12 +0200 Subject: [PATCH 4/8] Bazarr: Text color fix. --- css/base/bazarr/bazarr-base.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/css/base/bazarr/bazarr-base.css b/css/base/bazarr/bazarr-base.css index b672cdc3..f76210a5 100644 --- a/css/base/bazarr/bazarr-base.css +++ b/css/base/bazarr/bazarr-base.css @@ -17,6 +17,10 @@ html { /* TEXT */ +.bazarr-Text-root { + color: var(--text); +} + [class$="-label"]:not([class$="-Button-label"]), label { color: var(--text-hover) !important; From 48f7cf8e13c593f1d526cc71c3c53c05163e7149 Mon Sep 17 00:00:00 2001 From: GilbN Date: Sun, 14 Apr 2024 17:06:34 +0200 Subject: [PATCH 5/8] Find latest stable version if QBITTORRENT_VERSION is not set. --- .../etc/s6-overlay/s6-rc.d/init-mod-themepark/run | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 1e8ffd05..bf0ca477 100755 --- a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -23,6 +23,12 @@ if [ "${TP_DISABLE_THEME}" = true ]; then exit 0 fi +if [ -z ${QBITTORRENT_VERSION+x} ]; then \ + echo 'QBITTORRENT_VERSION not set. Using the latest stable.' \ + QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /temp \ + && awk '/^P:qbittorrent-nox$/,/V:/' /temp/APKINDEX | sed -n 2p | sed 's/^V://'); \ +fi + # Display variables for troubleshooting echo -e "Variables set:\\n\ 'APP_FILEPATH'=${APP_FILEPATH}\\n\ @@ -67,11 +73,9 @@ if [[ ! -d /themepark ]]; then echo '| Downloading WebUI files from github |' echo '---------------------------------------' printf '\nDownloading qBittorrent to /temp\n' - if [[ -n ${QBITTORRENT_VERSION} ]]; then - git clone --depth 1 -b release-${QBITTORRENT_VERSION} https://github.com/qbittorrent/qBittorrent /temp - else - git clone --depth 1 https://github.com/qbittorrent/qBittorrent /temp - fi + echo 'Downloading WebUI for version:' "${QBITTORRENT_VERSION}" + git clone --depth 1 -b release-${QBITTORRENT_VERSION} https://github.com/qbittorrent/qBittorrent /temp + printf '\nDownload finished\n\n' cp -a /temp/src/webui/www /themepark cp -a /temp/src/icons/. /themepark/public/icons From 3361da14168a9341d3b1854e6f65d72f74d69af1 Mon Sep 17 00:00:00 2001 From: GilbN Date: Sun, 14 Apr 2024 17:18:07 +0200 Subject: [PATCH 6/8] qbit mod, fix sed --- .../root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index bf0ca477..ee7cdf03 100755 --- a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -25,8 +25,8 @@ fi if [ -z ${QBITTORRENT_VERSION+x} ]; then \ echo 'QBITTORRENT_VERSION not set. Using the latest stable.' \ - QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /temp \ - && awk '/^P:qbittorrent-nox$/,/V:/' /temp/APKINDEX | sed -n 2p | sed 's/^V://'); \ + QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://' | sed 's/-.*//'); \ fi # Display variables for troubleshooting @@ -82,6 +82,7 @@ if [[ ! -d /themepark ]]; then cp -a /temp/src/icons/. /themepark/private/icons printf '\nCopy finished\n\n' rm -rf /temp + rm -rf /tmp/* printf '\nCleanup finished\n\n' fi From 4eaba98a1c30f8283f994b0813b64ba709d946f1 Mon Sep 17 00:00:00 2001 From: GilbN Date: Sun, 14 Apr 2024 17:24:52 +0200 Subject: [PATCH 7/8] fix script --- .../root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index ee7cdf03..183359f9 100755 --- a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -24,7 +24,7 @@ if [ "${TP_DISABLE_THEME}" = true ]; then fi if [ -z ${QBITTORRENT_VERSION+x} ]; then \ - echo 'QBITTORRENT_VERSION not set. Using the latest stable.' \ + echo 'QBITTORRENT_VERSION not set. Using the latest stable.' QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://' | sed 's/-.*//'); \ fi From 5e72e5b0352828078baa3e38d9caa21093e240a1 Mon Sep 17 00:00:00 2001 From: GilbN Date: Tue, 16 Apr 2024 21:26:05 +0200 Subject: [PATCH 8/8] Prowlarr: Fix Index table row hover. Prowlarr: Remove invert color stuff on stats page. Servarr: Override some root variables. --- css/base/prowlarr/prowlarr-base.css | 13 ++++++++----- css/defaults/servarr-base.css | 6 ++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/css/base/prowlarr/prowlarr-base.css b/css/base/prowlarr/prowlarr-base.css index d98a5e63..cc94aadf 100644 --- a/css/base/prowlarr/prowlarr-base.css +++ b/css/base/prowlarr/prowlarr-base.css @@ -14,6 +14,10 @@ @import url("/css/defaults/transparent.css"); @import url("/css/defaults/servarr-base.css"); +:root { + --chartBackgroundColor: var(--transparency-dark-35) !important; + } + [class*="IndexerSearchInput-sectionTitle-"] { color: var(--text-hover); } @@ -62,14 +66,13 @@ color: var(--text-hover); } -/* ChartJS */ -[class*="Stats-fullWidthChart-"], -[class*="Stats-halfWidthChart-"] { - background: var(--transparency-dark-25) !important; +[class*="IndexerIndexTable-row-"]:hover { + background: var(--transparency-dark-10); + color: var(--text-hover); } canvas { - filter: invert(1) + text: white !important; } /* QUERY OPTIONS */ diff --git a/css/defaults/servarr-base.css b/css/defaults/servarr-base.css index 27d3a2ef..cf4a429a 100644 --- a/css/defaults/servarr-base.css +++ b/css/defaults/servarr-base.css @@ -13,6 +13,12 @@ @import url("/css/defaults/placeholders.css"); @import url("/css/defaults/transparent.css"); +:root { + --scrollbarBackgroundColor: var(--transparency-light-25) !important; + --scrollbarHoverBackgroundColor: var(--transparency-light-35) !important; + --linkColor: var(--link-color) !important; + --linkHoverColor: var(--link-color-hover) !important; + } body { background: var(--main-bg-color);