From 13768ba606c9e9c6dda5f0f8b95da7c95bde8490 Mon Sep 17 00:00:00 2001 From: GilbN Date: Sun, 27 Mar 2022 16:19:36 +0200 Subject: [PATCH 1/7] Fix for #345 --- css/base/radarr/radarr-base.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/css/base/radarr/radarr-base.css b/css/base/radarr/radarr-base.css index a8dec1b7..0fe04a67 100644 --- a/css/base/radarr/radarr-base.css +++ b/css/base/radarr/radarr-base.css @@ -903,12 +903,14 @@ input:focus:-ms-input-placeholder { border-left-color: transparent !important; } -[class*="CalendarEvent-unreleased-"] { +[class*="CalendarEvent-unreleased-"], +[class*="CalendarEvent-continuing-"] { background: rgb(var(--calendar-unaired) / .7) !important; border-left-color: transparent !important; } -[class*="Calendar-calendar-"] [class*="CalendarEvent-unreleased-"]:hover { +[class*="Calendar-calendar-"] [class*="CalendarEvent-unreleased-"]:hover, +[class*="Calendar-calendar-"] [class*="CalendarEvent-continuing-"]:hover { background: rgb(var(--calendar-unaired) / .5) !important; border-left-color: transparent !important; } From 7acfcbd2748807f9c7f10a99348b7b21a3297864 Mon Sep 17 00:00:00 2001 From: GilbN Date: Sun, 27 Mar 2022 16:24:02 +0200 Subject: [PATCH 2/7] add nginx listen 443 and certs to default config --- docker/root/defaults/default | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/root/defaults/default b/docker/root/defaults/default index c0e65e4d..ce6b866c 100644 --- a/docker/root/defaults/default +++ b/docker/root/defaults/default @@ -1,9 +1,14 @@ server { listen 80 default_server; listen [::]:80 default_server; + listen 443 ssl http2; + listen [::]:443 ssl http2; server_name _; + ssl_certificate /config/keys/cert.crt; + ssl_certificate_key /config/keys/cert.key; + root /config/www; index index.html index.htm index.php; From d26f487e02637899e6e4ed72bd9c303ec0c9f9d9 Mon Sep 17 00:00:00 2001 From: GilbN Date: Sun, 27 Mar 2022 18:51:01 +0200 Subject: [PATCH 3/7] fix: :bug: *arr fixes for #345 --- css/base/lidarr/lidarr-base.css | 10 ++++++++-- css/base/radarr/radarr-base.css | 10 ++++++++-- css/base/readarr/readarr-base.css | 10 ++++++++-- css/base/sonarr/sonarr-base.css | 4 ++++ 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/css/base/lidarr/lidarr-base.css b/css/base/lidarr/lidarr-base.css index ad2009aa..c97b7226 100644 --- a/css/base/lidarr/lidarr-base.css +++ b/css/base/lidarr/lidarr-base.css @@ -854,6 +854,10 @@ input:focus:-ms-input-placeholder { } /* CALENDAR */ +[class*="CircularProgressBar-circularProgressBarContainer-"] svg circle { + stroke: white !important; +} + [class*="CalendarEvent-downloaded-"] { background: rgb(var(--calendar-available) / .7) !important; border-left-color: transparent !important; @@ -894,12 +898,14 @@ input:focus:-ms-input-placeholder { border-left-color: transparent !important; } -[class*="CalendarEvent-downloading-"] { +[class*="CalendarEvent-downloading-"], +[class*="CalendarEvent-queue-"] { background: rgb(var(--calendar-downloading) / .7) !important; border-left-color: transparent !important; } -[class*="Calendar-calendar-"] [class*="CalendarEvent-downloading-"]:hover { +[class*="Calendar-calendar-"] [class*="CalendarEvent-downloading-"]:hover, +[class*="Calendar-calendar-"] [class*="CalendarEvent-queue-"]:hover { background: rgb(var(--calendar-downloading) / .5) !important; border-left-color: transparent !important; } diff --git a/css/base/radarr/radarr-base.css b/css/base/radarr/radarr-base.css index 0fe04a67..d9d79aba 100644 --- a/css/base/radarr/radarr-base.css +++ b/css/base/radarr/radarr-base.css @@ -871,6 +871,10 @@ input:focus:-ms-input-placeholder { } /* CALENDAR */ +[class*="CircularProgressBar-circularProgressBarContainer-"] svg circle { + stroke: white !important; +} + [class*="CalendarEvent-downloaded-"] { background: rgb(var(--calendar-available) / .7) !important; border-left-color: transparent !important; @@ -935,12 +939,14 @@ input:focus:-ms-input-placeholder { border-left-color: transparent !important; } -[class*="CalendarEvent-downloading-"] { +[class*="CalendarEvent-downloading-"], +[class*="CalendarEvent-queue-"] { background: rgb(var(--calendar-downloading) / .7) !important; border-left-color: transparent !important; } -[class*="Calendar-calendar-"] [class*="CalendarEvent-downloading-"]:hover { +[class*="Calendar-calendar-"] [class*="CalendarEvent-downloading-"]:hover, +[class*="Calendar-calendar-"] [class*="CalendarEvent-queue-"]:hover { background: rgb(var(--calendar-downloading) / .5) !important; border-left-color: transparent !important; } diff --git a/css/base/readarr/readarr-base.css b/css/base/readarr/readarr-base.css index 24caabcb..922a543e 100644 --- a/css/base/readarr/readarr-base.css +++ b/css/base/readarr/readarr-base.css @@ -857,6 +857,10 @@ input:focus:-ms-input-placeholder { } /* CALENDAR */ +[class*="CircularProgressBar-circularProgressBarContainer-"] svg circle { + stroke: white !important; +} + [class*="CalendarEvent-downloaded-"]:not([class*="AgendaEvent-"]) { background: rgb(var(--calendar-downloaded) / .7) !important; border-left-color: transparent !important; @@ -897,12 +901,14 @@ input:focus:-ms-input-placeholder { border-left-color: transparent !important; } -[class*="CalendarEvent-downloading-"]:not([class*="AgendaEvent-"]) { +[class*="CalendarEvent-downloading-"]:not([class*="AgendaEvent-"]), +[class*="CalendarEvent-queue-"]:not([class*="AgendaEvent-"]) { background: rgb(var(--calendar-downloading) / .7) !important; border-left-color: transparent !important; } -[class*="Calendar-calendar-"] [class*="CalendarEvent-downloading-"]:hover:not([class*="AgendaEvent-"]) { +[class*="Calendar-calendar-"] [class*="CalendarEvent-downloading-"]:hover:not([class*="AgendaEvent-"]), +[class*="Calendar-calendar-"] [class*="CalendarEvent-queue-"]:hover:not([class*="AgendaEvent-"]) { background: rgb(var(--calendar-downloading) / .5) !important; border-left-color: transparent !important; } diff --git a/css/base/sonarr/sonarr-base.css b/css/base/sonarr/sonarr-base.css index 47025c65..5da42eef 100644 --- a/css/base/sonarr/sonarr-base.css +++ b/css/base/sonarr/sonarr-base.css @@ -831,6 +831,10 @@ input:focus:-ms-input-placeholder { } /* CALENDAR */ +[class*="CircularProgressBar-circularProgressBarContainer-"] svg circle { + stroke: white !important; +} + [class*="CalendarEvent-downloaded-"] { background: rgb(var(--calendar-tv-available) / .7) !important; border-left-color: transparent !important; From f417c7901bfcabe7a4cab6694569902b39ae9f07 Mon Sep 17 00:00:00 2001 From: GilbN Date: Sun, 27 Mar 2022 20:30:58 +0200 Subject: [PATCH 4/7] fix: --- css/base/plex/plex-base.css | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/css/base/plex/plex-base.css b/css/base/plex/plex-base.css index 9db4c276..4e130a8f 100644 --- a/css/base/plex/plex-base.css +++ b/css/base/plex/plex-base.css @@ -94,7 +94,8 @@ a, [class*="PrePlayDetailsGroupItem-groupItem-"] a, [class*="MetadataPosterCardTitle-title-"] a, a[class*="MetadataPosterCardTitle-title-"], -[class*="PrePlayTagListLink-tagsListLink-"][class*="Link-default-"] { +[class*="PrePlayTagListLink-tagsListLink-"][class*="Link-default-"], +[class*="MetadataPosterCardTitle-title-"] { color: var(--link-color) } @@ -239,6 +240,11 @@ body,[class*="FullPageBackground-backgroundContainer-"] { /* ACCENTS */ +.heart-rating.user-rating, .star-rating.user-rating { + color: rgb(var(--accent-color)); + opacity: 1; +} + [class*="Badge-primary-"], .nav-header>li>a.selected .badge { background-color: rgb(var(--accent-color)); @@ -506,7 +512,7 @@ circle { .well, .files ul li { color: var(--text); - background-color: rgb(255 255 255 / 10%); + background-color: rgb(0 0 0 / 10%); border: 1px solid transparent; -webkit-box-shadow: inset 0 1px 1px rgb(0 0 0 / 5%); box-shadow: inset 0 1px 1px rgb(0 0 0 / 5%); From 1a0b36a8a26ff95536d99b0cd5658d6dd76b8f0e Mon Sep 17 00:00:00 2001 From: GilbN Date: Sun, 27 Mar 2022 22:23:21 +0200 Subject: [PATCH 5/7] feat: :lipstick: *arr search result accents --- css/base/lidarr/lidarr-base.css | 4 ++++ css/base/radarr/radarr-base.css | 4 ++++ css/base/readarr/readarr-base.css | 4 ++++ css/base/sonarr/sonarr-base.css | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/css/base/lidarr/lidarr-base.css b/css/base/lidarr/lidarr-base.css index c97b7226..eab46b40 100644 --- a/css/base/lidarr/lidarr-base.css +++ b/css/base/lidarr/lidarr-base.css @@ -717,6 +717,10 @@ a:hover { } /* SEARCH RESULTS */ +[class*="SearchResult-title-"]{ + color:var(--link-color); +} + [class*="AddNewArtistSearchResult-year-"] { color: #fff; } diff --git a/css/base/radarr/radarr-base.css b/css/base/radarr/radarr-base.css index d9d79aba..06dfdcfe 100644 --- a/css/base/radarr/radarr-base.css +++ b/css/base/radarr/radarr-base.css @@ -723,6 +723,10 @@ a:hover { } /* SEARCH RESULTS */ +[class*="SearchResult-title-"]{ + color:var(--link-color); +} + [class*="AddNewMovieSearchResult-searchResult-"], [class*="AddNewMovieSearchResult-underlay-"] { background-color: transparent !important; diff --git a/css/base/readarr/readarr-base.css b/css/base/readarr/readarr-base.css index 922a543e..67dfc0fc 100644 --- a/css/base/readarr/readarr-base.css +++ b/css/base/readarr/readarr-base.css @@ -721,6 +721,10 @@ a:hover { } /* SEARCH RESULTS */ +[class*="SearchResult-title-"]{ + color:var(--link-color); +} + [class*="AddNewAuthorSearchResult-year-"] { color: #fff; } diff --git a/css/base/sonarr/sonarr-base.css b/css/base/sonarr/sonarr-base.css index 5da42eef..7da389a0 100644 --- a/css/base/sonarr/sonarr-base.css +++ b/css/base/sonarr/sonarr-base.css @@ -750,6 +750,10 @@ input:focus:-ms-input-placeholder { } /* SEARCH RESULTS */ +[class*="SearchResult-title-"]{ + color:var(--link-color); +} + [class*="AddNewSeriesSearchResult-underlay-"] { background-color: transparent !important; } From a094b0fe6cacf8d024e977b161b496fa52ac9755 Mon Sep 17 00:00:00 2001 From: GilbN Date: Mon, 28 Mar 2022 18:11:58 +0200 Subject: [PATCH 6/7] Dont run as service #350 --- docker/root/etc/services.d/themepark/run | 4 ---- themes.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 docker/root/etc/services.d/themepark/run diff --git a/docker/root/etc/services.d/themepark/run b/docker/root/etc/services.d/themepark/run deleted file mode 100644 index 3e1ae806..00000000 --- a/docker/root/etc/services.d/themepark/run +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/with-contenv bash - - exec \ - python3 /config/www/themes.py \ No newline at end of file diff --git a/themes.py b/themes.py index 26f56044..6458561a 100644 --- a/themes.py +++ b/themes.py @@ -139,7 +139,7 @@ if __name__ == "__main__": themes = [name for name in listdir('./css/theme-options') if isfile(join('./css/theme-options', name))] community_themes = [name for name in listdir('./css/community-theme-options') if isfile(join('./css/community-theme-options', name))] develop = True if isdir(".git") and subprocess.check_output(["git", "symbolic-ref", "--short", "HEAD"]).decode('ascii').strip() == "develop" else False - if env_domain: + if env_domain and env_domain != '$http_host': DOMAIN = env_domain else: with open("CNAME", "rt", closefd=True) as cname: From 772f7bf8be440af3d1ca9e232f4ddeac63d62db1 Mon Sep 17 00:00:00 2001 From: GilbN Date: Mon, 28 Mar 2022 18:12:13 +0200 Subject: [PATCH 7/7] config and sed changes --- docker/root/defaults/default | 8 ++++---- docker/root/etc/cont-init.d/50-config | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/root/defaults/default b/docker/root/defaults/default index ce6b866c..5e698386 100644 --- a/docker/root/defaults/default +++ b/docker/root/defaults/default @@ -14,10 +14,10 @@ server { location / { sub_filter_types *; - sub_filter 'https://theme-park.dev' https://TP_DOMAIN; - sub_filter 'http://theme-park.dev' http://TP_DOMAIN; - sub_filter 'https://develop.theme-park.dev' https://TP_DOMAIN; - sub_filter 'http://develop.theme-park.dev' http://TP_DOMAIN; + sub_filter 'https://theme-park.dev' $scheme://TP_DOMAIN; + sub_filter 'http://theme-park.dev' $scheme://TP_DOMAIN; + sub_filter 'https://develop.theme-park.dev' $scheme://TP_DOMAIN; + sub_filter 'http://develop.theme-park.dev' $scheme://TP_DOMAIN; sub_filter_once off; try_files $uri $uri/ /index.html; } diff --git a/docker/root/etc/cont-init.d/50-config b/docker/root/etc/cont-init.d/50-config index b4664bfc..e4c17df2 100644 --- a/docker/root/etc/cont-init.d/50-config +++ b/docker/root/etc/cont-init.d/50-config @@ -23,10 +23,7 @@ if [[ -z ${TP_SCHEME} ]]; then fi DEFAULT='/defaults/default' -sed -i "s/sub_filter 'https:\/\/theme-park.dev' https:\/\/TP_DOMAIN;/sub_filter 'https:\/\/theme-park.dev' ${TP_SCHEME}:\/\/${TP_DOMAIN}; /g" ${DEFAULT} -sed -i "s/sub_filter 'http:\/\/theme-park.dev' http:\/\/TP_DOMAIN;/sub_filter 'http:\/\/theme-park.dev' ${TP_SCHEME}:\/\/${TP_DOMAIN}; /g" ${DEFAULT} -sed -i "s/sub_filter 'https:\/\/develop.theme-park.dev' https:\/\/TP_DOMAIN;/sub_filter 'https:\/\/develop.theme-park.dev' ${TP_SCHEME}:\/\/${TP_DOMAIN}; /g" ${DEFAULT} -sed -i "s/sub_filter 'http:\/\/develop.theme-park.dev' http:\/\/TP_DOMAIN;/sub_filter 'http:\/\/develop.theme-park.dev' ${TP_SCHEME}:\/\/${TP_DOMAIN}; /g" ${DEFAULT} +sed -i "s/TP_DOMAIN/${TP_DOMAIN} /g" ${DEFAULT} cp /defaults/default /config/nginx/site-confs # make our folders and links @@ -40,6 +37,9 @@ cp /app/themepark/index.html /config/www cp /app/themepark/themes.py /config/www cp /app/themepark/CNAME /config/www +echo 'Creating CSS files' +python3 /config/www/themes.py + # permissions chown -R abc:abc \ /config \ No newline at end of file