Skip to content

Commit 6ffb97f

Browse files
authored
Merge pull request #544 from themepark-dev/develop
1.16.0
2 parents 89a556c + e265f47 commit 6ffb97f

File tree

27 files changed

+232
-39
lines changed

27 files changed

+232
-39
lines changed

css/addons/radarr/radarr-4k-logo/radarr-4k-logo.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,9 @@
2424
width: 120px;
2525
height: 40px;
2626
opacity: 1;
27+
}
28+
29+
.panel-header > img.logo {
30+
content: url("/css/addons/radarr/radarr-4k-logo/radarr4k-v3.png");
31+
width: auto;
2732
}

css/addons/sonarr/sonarr-4k-logo/sonarr-4k-logo.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,8 @@
1313
[class*="LoadingPage-logoFull-"] {
1414
content: url("/css/addons/sonarr/sonarr-4k-logo/sonarr-4k.png");
1515
opacity: 1;
16+
}
17+
18+
.panel-header > img.logo {
19+
content: url("/css/addons/sonarr/sonarr-4k-logo/sonarr-4k.png");
1620
}
-1.06 MB
Binary file not shown.

css/addons/sonarr/sonarr-4k-text-logo/sonarr-4k-text-logo.css

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
[class*="PageHeader-logo-"] {
1212
width: 32px;
1313
height: 32px;
14-
margin-left: 0px;
14+
margin-left: 0;
1515
content: url("/css/addons/sonarr/sonarr-4k-logo/sonarr-4k.png");
1616
}
1717
}
@@ -24,4 +24,9 @@
2424
width: 120px;
2525
height: 40px;
2626
opacity: 1;
27+
}
28+
29+
.panel-header > img.logo {
30+
content: url("/css/addons/sonarr/sonarr-4k-text-logo/sonarr-4k-text.png");
31+
width: auto;
2732
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
@media (min-width: 752px) {
2+
[class*="PageHeader-logo-"] {
3+
content: url("/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue.png");
4+
}
5+
}
6+
7+
@media only screen and (max-width: 768px) {
8+
[class*="PageHeader-logo-"] {
9+
content: url("/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue.png");
10+
}
11+
}
12+
13+
[class*="LoadingPage-logoFull-"] {
14+
content: url("/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue.png");
15+
opacity: 1;
16+
}
17+
18+
.panel-header > img.logo {
19+
content: url("/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue.png");
20+
}
Loading
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
@media (min-width: 752px) {
2+
[class*="PageHeader-logo-"] {
3+
content: url("/css/addons/sonarr/sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png");
4+
margin-left: 15px;
5+
width: 120px;
6+
height: 40px;
7+
}
8+
}
9+
10+
@media only screen and (max-width: 768px) {
11+
[class*="PageHeader-logo-"] {
12+
width: 32px;
13+
height: 32px;
14+
margin-left: 0;
15+
content: url("/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue.png");
16+
}
17+
}
18+
19+
[class*="LoadingPage-logoFull-"] {
20+
content: url("/css/addons/sonarr/sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png");
21+
margin-top: 50px;
22+
margin-right: auto;
23+
margin-left: auto;
24+
width: 120px;
25+
height: 40px;
26+
opacity: 1;
27+
}
28+
29+
.panel-header > img.logo {
30+
content: url("/css/addons/sonarr/sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png");
31+
width: auto;
32+
}
Loading
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
@media (min-width: 752px) {
2+
[class*="PageHeader-logo-"] {
3+
content: url("/css/addons/sonarr/sonarr-anime-logo/sonarr-anime.png");
4+
}
5+
}
6+
7+
@media only screen and (max-width: 768px) {
8+
[class*="PageHeader-logo-"] {
9+
content: url("/css/addons/sonarr/sonarr-anime-logo/sonarr-anime.png");
10+
}
11+
}
12+
13+
[class*="LoadingPage-logoFull-"] {
14+
content: url("/css/addons/sonarr/sonarr-anime-logo/sonarr-anime.png");
15+
opacity: 1;
16+
}
17+
18+
.panel-header > img.logo {
19+
content: url("/css/addons/sonarr/sonarr-anime-logo/sonarr-anime.png");
20+
}
Loading
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
@media (min-width: 752px) {
2+
[class*="PageHeader-logo-"] {
3+
content: url("/css/addons/sonarr/sonarr-anime-text-logo/sonarr-anime-text.png");
4+
margin-left: 15px;
5+
width: 120px;
6+
height: 40px;
7+
}
8+
}
9+
10+
@media only screen and (max-width: 768px) {
11+
[class*="PageHeader-logo-"] {
12+
width: 32px;
13+
height: 32px;
14+
margin-left: 0;
15+
content: url("/css/addons/sonarr/sonarr-anime-logo/sonarr-anime.png");
16+
}
17+
}
18+
19+
[class*="LoadingPage-logoFull-"] {
20+
content: url("/css/addons/sonarr/sonarr-anime-text-logo/sonarr-anime-text.png");
21+
margin-top: 50px;
22+
margin-right: auto;
23+
margin-left: auto;
24+
width: 120px;
25+
height: 40px;
26+
opacity: 1;
27+
}
28+
29+
.panel-header > img.logo {
30+
content: url("/css/addons/sonarr/sonarr-anime-text-logo/sonarr-anime-text.png");
31+
width: auto;
32+
}
Loading

css/addons/sonarr/sonarr-logo.md

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# sonarr-*-logo
2+
3+
Source files:
4+
5+
1. [sonarr-logo.psd](sonarr-logo.psd) contains 256x256 sonarr logo and 3 more layers:
6+
7+
- sonarr-4k-logo
8+
- sonarr-anime-logo
9+
- sonarr-anime-blue-logo
10+
11+
1. [sonarr-text.psd](sonarr-text.psd) contains 900x29 sonarr with text logo and 2 more layers:
12+
- sonarr-anime-text-logo
13+
- sonarr-anime-blue-text-logo
14+
15+
Preview:
16+
17+
<table>
18+
<tr>
19+
<td>sonarr-4k-logo</td>
20+
<td> <img src="sonarr-4k-logo/sonarr-4k.png" width="100" height="100" alt="sonarr-4k-logo"/></td>
21+
<td style="background-color: white"> <img src="sonarr-4k-logo/sonarr-4k.png" width="100" height="100" alt="sonarr-4k-logo"/></td>
22+
<td style="background-color: #00ccff"><img src="sonarr-4k-logo/sonarr-4k.png" width="100" height="100" alt="sonarr-4k-logo"/></td>
23+
<td style="background-color: #2a2a2a"><img src="sonarr-4k-logo/sonarr-4k.png" width="100" height="100" alt="sonarr-4k-logo"/></td>
24+
<td style="background-color: #606060"><img src="sonarr-4k-logo/sonarr-4k.png" width="100" height="100" alt="sonarr-4k-logo"/></td>
25+
</tr>
26+
<tr>
27+
<td>sonarr-anime-logo</td>
28+
<td> <img src="sonarr-anime-logo/sonarr-anime.png" width="100" height="100" alt="sonarr-anime-logo"/></td>
29+
<td style="background-color: white"> <img src="sonarr-anime-logo/sonarr-anime.png" width="100" height="100" alt="sonarr-anime-logo"/></td>
30+
<td style="background-color: #00ccff"><img src="sonarr-anime-logo/sonarr-anime.png" width="100" height="100" alt="sonarr-anime-logo"/></td>
31+
<td style="background-color: #2a2a2a"><img src="sonarr-anime-logo/sonarr-anime.png" width="100" height="100" alt="sonarr-anime-logo"/></td>
32+
<td style="background-color: #606060"><img src="sonarr-anime-logo/sonarr-anime.png" width="100" height="100" alt="sonarr-anime-logo"/></td>
33+
</tr>
34+
<tr>
35+
<td>sonarr-anime-blue-logo</td>
36+
<td> <img src="sonarr-anime-blue-logo/sonarr-anime-blue.png" width="100" height="100" alt="sonarr-anime-blue-logo"/></td>
37+
<td style="background-color: white"> <img src="sonarr-anime-blue-logo/sonarr-anime-blue.png" width="100" height="100" alt="sonarr-anime-blue-logo"/></td>
38+
<td style="background-color: #00ccff"><img src="sonarr-anime-blue-logo/sonarr-anime-blue.png" width="100" height="100" alt="sonarr-anime-blue-logo"/></td>
39+
<td style="background-color: #2a2a2a"><img src="sonarr-anime-blue-logo/sonarr-anime-blue.png" width="100" height="100" alt="sonarr-anime-blue-logo"/></td>
40+
<td style="background-color: #606060"><img src="sonarr-anime-blue-logo/sonarr-anime-blue.png" width="100" height="100" alt="sonarr-anime-blue-logo"/></td>
41+
42+
</tr>
43+
</table>
44+
45+
<table>
46+
<tr>
47+
<td>sonarr-text-logo</td>
48+
<td> <img src="sonarr-text-logo/sonarr-text.png" width="200" height=auto alt="sonarr-4k-logo"/></td>
49+
<td style="background-color: white"> <img src="sonarr-text-logo/sonarr-text.png" width="200" height=auto alt="sonarr-4k-logo"/></td>
50+
<td style="background-color: #2a2a2a"><img src="sonarr-text-logo/sonarr-text.png" width="200" height=auto alt="sonarr-4k-logo"/></td>
51+
<td style="background-color: #606060"><img src="sonarr-text-logo/sonarr-text.png" width="200" height=auto alt="sonarr-4k-logo"/></td>
52+
</tr>
53+
<tr>
54+
<td>sonarr-4k-text-logo</td>
55+
<td> <img src="sonarr-4k-text-logo/sonarr-4k-text.png" width="200" height=auto alt="sonarr-anime-logo"/></td>
56+
<td style="background-color: white"> <img src="sonarr-4k-text-logo/sonarr-4k-text.png" width="200" height=auto alt="sonarr-anime-logo"/></td>
57+
<td style="background-color: #2a2a2a"><img src="sonarr-4k-text-logo/sonarr-4k-text.png" width="200" height=auto alt="sonarr-anime-logo"/></td>
58+
<td style="background-color: #606060"><img src="sonarr-4k-text-logo/sonarr-4k-text.png" width="200" height=auto alt="sonarr-anime-logo"/></td>
59+
</tr>
60+
<tr>
61+
<td>sonarr-anime-text-logo</td>
62+
<td> <img src="sonarr-anime-text-logo/sonarr-anime-text.png" width="200" height=auto alt="sonarr-anime-blue-logo"/></td>
63+
<td style="background-color: white"> <img src="sonarr-anime-text-logo/sonarr-anime-text.png" width="200" height=auto alt="sonarr-anime-blue-logo"/></td>
64+
<td style="background-color: #2a2a2a"><img src="sonarr-anime-text-logo/sonarr-anime-text.png" width="200" height=auto alt="sonarr-anime-blue-logo"/></td>
65+
<td style="background-color: #606060"><img src="sonarr-anime-text-logo/sonarr-anime-text.png" width="200" height=auto alt="sonarr-anime-blue-logo"/></td>
66+
</tr>
67+
<tr>
68+
<td>sonarr-anime-blue-text-logo</td>
69+
<td> <img src="sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png" width="200" height=auto alt="sonarr-anime-blue-logo"/></td>
70+
<td style="background-color: white"> <img src="sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png" width="200" height=auto alt="sonarr-anime-blue-logo"/></td>
71+
<td style="background-color: #2a2a2a"><img src="sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png" width="200" height=auto alt="sonarr-anime-blue-logo"/></td>
72+
<td style="background-color: #606060"><img src="sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png" width="200" height=auto alt="sonarr-anime-blue-logo"/></td>
73+
</tr>
74+
</table>

css/addons/sonarr/sonarr-logo.psd

1.25 MB
Binary file not shown.

css/addons/sonarr/sonarr-text-logo/sonarr-text-logo.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,9 @@
1616
width: 120px;
1717
height: 40px;
1818
opacity: 1;
19+
}
20+
21+
.panel-header > img.logo {
22+
content: url("/css/addons/sonarr/sonarr-text-logo/sonarr-text.png");
23+
width: auto;
1924
}

css/addons/sonarr/sonarr-text.psd

286 KB
Binary file not shown.

docker-mods/swag/root/etc/cont-init.d/98-themepark

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,6 @@ echo '-------------------------'
44
echo '| SWAG theme.park Mod |'
55
echo '-------------------------'
66

7-
if ! [[ -x "$(command -v svn)" ]]; then
8-
echo '--------------------------'
9-
echo '| Installing svn package |'
10-
echo '--------------------------'
11-
if [ -x "$(command -v apk)" ]; then
12-
apk update && \
13-
apk add --no-cache subversion
14-
elif [ -x "$(command -v apt-get)" ]; then
15-
apt-get update && \
16-
apt-get install -y subversion
17-
fi
18-
fi
19-
207
# Display variables for troubleshooting
218
echo -e "Variables set:\\n\
229
'TP_BRANCH'=${TP_BRANCH}\\n"
@@ -41,7 +28,7 @@ fi
4128

4229
mkdir -p /config/www/themepark
4330

44-
SHA_RELEASE=$(curl -sL "https://api.github.com/repos/gilbn/theme.park/commits/${TP_BRANCH}" | jq -r '.sha');
31+
SHA_RELEASE=$(curl -sL "https://api.github.com/repos/themepark-dev/theme.park/commits/${TP_BRANCH}" | jq -r '.sha');
4532
if [[ ! -f "/config/www/themepark/sha.txt" ]]; then
4633
SHA=""
4734
else
@@ -50,13 +37,21 @@ fi
5037
# Downloading fresh webui files from source.
5138
if [[ $SHA != $SHA_RELEASE ]]; then
5239
echo "-----------------------------------------------------"
53-
echo "| Downloading latest files from ${TP_BRANCH} branch |"
40+
echo "| Cloning latest files from ${TP_BRANCH} branch |"
41+
echo "-----------------------------------------------------"
42+
rm -rf /tmp/themepark
43+
git clone --depth 1 --quiet --branch ${TP_BRANCH} https://github.com/themepark-dev/theme.park.git /tmp/themepark
44+
echo "-----------------------------------------------------"
45+
echo "| Copying files to /config/www/themepark |"
46+
echo "-----------------------------------------------------"
47+
cp -a /tmp/themepark/css /config/www/themepark/
48+
cp -a /tmp/themepark/resources /config/www/themepark/
49+
cp -a /tmp/themepark/themes.json /config/www/themepark/
50+
cp -a /tmp/themepark/index.html /config/www/themepark/
51+
rm -rf /tmp/themepark
52+
echo "-----------------------------------------------------"
53+
echo '| Clone and copy finished |'
5454
echo "-----------------------------------------------------"
55-
svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/css" /config/www/themepark/css
56-
svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/resources" /config/www/themepark/resources
57-
svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/themes.json" /config/www/themepark
58-
svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/index.html" /config/www/themepark
59-
printf '\nDownload finished\n\n'
6055
fi
6156

6257
cat <<< "$SHA_RELEASE" > "/config/www/themepark/sha.txt"

docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run

Lines changed: 0 additions & 5 deletions
This file was deleted.

docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/type

Lines changed: 0 additions & 1 deletion
This file was deleted.

docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/up

Lines changed: 0 additions & 1 deletion
This file was deleted.

docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/dependencies.d/init-mods-package-install

Whitespace-only changes.

docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ fi
2828

2929
mkdir -p /config/www/themepark
3030

31-
SHA_RELEASE=$(curl -sL "https://api.github.com/repos/gilbn/theme.park/commits/${TP_BRANCH}" | jq -r '.sha');
31+
SHA_RELEASE=$(curl -sL "https://api.github.com/repos/themepark-dev/theme.park/commits/${TP_BRANCH}" | jq -r '.sha');
3232
if [[ ! -f "/config/www/themepark/sha.txt" ]]; then
3333
SHA=""
3434
else
@@ -37,13 +37,21 @@ fi
3737
# Downloading fresh webui files from source.
3838
if [[ $SHA != $SHA_RELEASE ]]; then
3939
echo "-----------------------------------------------------"
40-
echo "| Downloading latest files from ${TP_BRANCH} branch |"
40+
echo "| Cloning latest files from ${TP_BRANCH} branch |"
41+
echo "-----------------------------------------------------"
42+
rm -rf /tmp/themepark
43+
git clone --depth 1 --quiet --branch ${TP_BRANCH} https://github.com/themepark-dev/theme.park.git /tmp/themepark
44+
echo "-----------------------------------------------------"
45+
echo "| Copying files to /config/www/themepark |"
46+
echo "-----------------------------------------------------"
47+
cp -a /tmp/themepark/css /config/www/themepark/
48+
cp -a /tmp/themepark/resources /config/www/themepark/
49+
cp -a /tmp/themepark/themes.json /config/www/themepark/
50+
cp -a /tmp/themepark/index.html /config/www/themepark/
51+
rm -rf /tmp/themepark
52+
echo "-----------------------------------------------------"
53+
echo '| Clone and copy finished |'
4154
echo "-----------------------------------------------------"
42-
svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/css" /config/www/themepark/css
43-
svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/resources" /config/www/themepark/resources
44-
svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/themes.json" /config/www/themepark
45-
svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/index.html" /config/www/themepark
46-
printf '\nDownload finished\n\n'
4755
fi
4856

4957
cat <<< "$SHA_RELEASE" > "/config/www/themepark/sha.txt"

docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-themepark-add-package

Whitespace-only changes.

docker-mods/swag/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-themepark-add-package

Whitespace-only changes.

docker-mods/vuetorrent/root/etc/cont-init.d/98-themepark

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ if [[ -z ${TP_THEME} ]]; then
5555
fi
5656
RELEASE_FILEPATH='/vuetorrent/release.json'
5757
NEEDS_UPDATE=false
58-
CURRENT_RELEASE=$(curl -s https://api.github.com/repos/WDaan/VueTorrent/releases/latest | jq -r ".assets[]")
58+
CURRENT_RELEASE=$(curl -Ls https://api.github.com/repos/WDaan/VueTorrent/releases/latest | jq -r ".assets[]")
5959

6060
# ===============================================
6161
install_deps() {
@@ -146,4 +146,4 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${INDEX_FILEPATH}"; then
146146
sed -i "s/<\/body>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/base\/vuetorrent\/vuetorrent-base.css'><\/body> /g" "${INDEX_FILEPATH}"
147147
sed -i "s/<\/body>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/body> /g" "${INDEX_FILEPATH}"
148148
printf 'Stylesheet set to %s on public index.html\n' "${TP_THEME}"
149-
fi
149+
fi

docker-mods/vuetorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ if [[ -z ${TP_THEME} ]]; then
5555
fi
5656
RELEASE_FILEPATH='/vuetorrent/release.json'
5757
NEEDS_UPDATE=false
58-
CURRENT_RELEASE=$(curl -s https://api.github.com/repos/WDaan/VueTorrent/releases/latest | jq -r ".assets[]")
58+
CURRENT_RELEASE=$(curl -Ls https://api.github.com/repos/WDaan/VueTorrent/releases/latest | jq -r ".assets[]")
5959

6060
# ===============================================
6161
check_updates() {
@@ -131,4 +131,4 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${INDEX_FILEPATH}"; then
131131
sed -i "s/<\/body>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/base\/vuetorrent\/vuetorrent-base.css'><\/body> /g" "${INDEX_FILEPATH}"
132132
sed -i "s/<\/body>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/body> /g" "${INDEX_FILEPATH}"
133133
printf 'Stylesheet set to %s on public index.html\n' "${TP_THEME}"
134-
fi
134+
fi

0 commit comments

Comments
 (0)