Merge pull request #563 from themepark-dev/develop

1.17.0

css/base/audiobookshelf/audiobookshelf-base.css

@@ -0,0 +1,238 @@
+@import url("/css/defaults/placeholders.css");
+@import url("/css/defaults/transparent.css");
+
+
+/* TEXT */
+body,
+p{
+  color: var(--text) !important;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6{
+  color: var(--text-hover) !important;
+}
+
+
+/* LINKS */
+a{
+  color: var(--link-color) !important;
+}
+
+a:hover{
+  color: var(--link-color-hover) !important;
+}
+
+
+/* BODY */
+.bg-primary{
+    background: var(--transparency-dark-40) !important;
+}
+body, .bg-bg, #bookshelf, #app-content, #page-wrapper{
+    background: var(--main-bg-color);
+    background-repeat: repeat, no-repeat;
+    background-attachment: fixed, fixed;
+    background-position: center center, center center;
+    background-size: auto, cover;
+    -webkit-background-size: auto, cover;
+    -moz-background-size: auto, cover;
+    -o-background-size: auto, cover;
+    color: var(--text);
+}
+.bg-bg{
+    background: var(--modal-header-color) !important;
+}
+
+
+/* HEADER */
+#appbar,
+#appbar > div{
+    background: var(--modal-header-color) !important;
+}
+
+
+/* BUTTONS */
+button.bg-success,
+button.bg-success *, 
+.abs-btn,
+button.bg-primary, a.bg-primary{
+    background: var(--button-color) !important;
+    color: var(--button-text) !important;
+    border:none !important;
+}
+button.bg-success:hover,
+button.bg-success:hover *,
+.abs-btn:hover,
+button.bg-primary:hover, a.bg-primary:hover{
+    background: var(--button-color-hover) !important;
+    color: var(--button-text-hover) !important;
+}
+button .material-icons{
+    color: var(--button-text-color) !important;
+}
+button:hover .material-icons{
+    color: var(--button-text-color-hover) !important;
+}
+
+
+/* CARDS */
+[id*="book-card-"] .border-yellow-400{
+    border-color:var(--button-color) !important;
+}
+
+
+/* Icons */
+.material-icons,
+.abs-icons{
+    color: rgb(var(--accent-color)) !important;
+}
+.material-icons:hover,
+.abs-icons:hover{
+    color: var(--accent-color-hover) !important;
+}
+
+
+/* TOOLBAR */
+#toolbar{
+    background: var(--transparency-dark-25) !important;
+}
+
+
+/* SIDEBAR */
+.box-shadow-side{
+    background: var(--transparency-dark-25) !important;
+}
+#siderail-buttons-container [class*="bg-yellow-"]{
+    background: rgb(var(--accent-color)) !important;
+}
+#siderail-buttons-container > a{
+    background: var(--modal-header-color) !important;
+}
+#siderail-buttons-container > a [class*="material-icons-"],
+#siderail-buttons-container > a svg{
+    color: rgb(var(--accent-color)) !important;
+}
+#siderail-buttons-container > a:hover [class*="material-icons-"],
+#siderail-buttons-container > a:hover svg{
+    color: var(--accent-color-hover) !important;
+}
+#siderail-buttons-container > a[aria-current="page"] [class*="material-icons-"],
+#siderail-buttons-container > a[aria-current="page"] svg{
+    color: var(--button-text-color) !important;
+}
+#siderail-buttons-container > a[aria-current="page"]:hover [class*="material-icons-"],
+#siderail-buttons-container > a[aria-current="page"]:hover svg{
+    color: var(--button-text-color-hover) !important;
+}
+
+
+/* SCROLLBAR */
+::-webkit-scrollbar-thumb{
+    background: rgb(var(--accent-color)) !important;
+}
+#bookshelf{
+    scrollbar-color: rgb(var(--accent-color)) transparent !important;
+}
+
+
+/* INPUTS */
+input.bg-primary{
+    background:none !important;
+}
+
+
+/* TABLES */
+table * {
+    background: transparent !important;
+}
+table tr:nth-child(2n){
+    background: var(--transparency-dark-30) !important;
+}
+table tr:nth-child(odd){
+    background: var(--transparency-dark-15) !important;
+}
+table tr:hover{
+    background: rgb(var(--accent-color),0.25) !important;
+}
+table tr:nth-child(1), table tr:nth-child(1):hover {
+    background: var(--transparency-dark-25) !important;
+}
+table tr svg.text-green-500{
+    color: rgb(var(--accent-color)) !important;
+}
+
+
+
+/* DROPDOWNS */
+button[aria-haspopup="listbox"]{
+    background: var(--transparency-dark-25) !important;
+    color: var(--text) !important;
+}
+ul[role="listbox"]{
+    background: var(--modal-bg-color) !important;
+}
+ul[role="listbox"] li:hover{
+    background: var(--transparency-dark-25) !important;
+}
+ul[role="listbox"] li.text-yellow-400{
+    color: rgb(var(--accent-color)) !important;
+}
+ul[role="listbox"] li.text-yellow-400:hover{
+    color: var(--accent-color-hover) !important;
+}
+
+/* CONFIGPAGE */
+.configContent button[role="checkbox"].bg-primary{
+    background: var(--transparency-dark-35) !important;
+}
+.configContent button[role="checkbox"].bg-success{
+    background: var(--button-color) !important;
+}
+.configContent button[role="checkbox"] > span{
+    background: var(--text-hover) !important;
+    border: var(--text-hover) !important;
+}
+
+/* CONFIGPAGE - SETTINGS */
+.configContent .userAudiobooksTable tr:nth-child(1){
+    background: var(--transparency-dark-40) !important;
+}
+.configContent .userAudiobooksTable tr.isFinished{
+    background:rgb(var(--accent-color),0.15) !important;
+}
+
+/* CONFIGPAGE - LIBRARIES */
+.configContent.page-Libraries .list-group .bg-warning{
+    background: rgb(var(--accent-color)) !important;
+}
+
+/* CONFIGPAGE - LOGS */
+.configContent.page-Logs #log-container .bg-info{
+    background: var(--transparency-dark-40) !important;
+}
+
+/* CONFIGPAGE - AUTHENTICATION */
+.configContent.page-Authentication svg.text-green-500{
+    color: rgb(var(--accent-color)) !important;
+}
+
+/* CONFIGPAGE - STATS */
+.configContent.Stats .bg-yellow-400{
+    background: rgb(var(--accent-color)) !important;
+}
+
+
+/* MISC */
+code{
+    background: var(--transparency-dark-40) !important;
+    color: rgb(var(--accent-color)) !important;
+}
+
+/* WTF? */
+#__layout > .bg-bg > .hidden > .absolute.bg-bg{
+    background: none !important;
+}

css/base/gitea/gitea-base.css

@@ -95,6 +95,10 @@ a:hover,
 }
 
 /* SCROLLBAR */
+* {
+    scrollbar-color: rgb(var(--accent-color),.5) transparent;
+    caret-color: var(--color-caret);
+}
 @media only screen and (min-width: 768px) {
     html {
         height: 100%;
@@ -172,7 +176,8 @@ footer,
 .repository .diff-box .header .file,
 .CodeMirror,
 .EasyMDEContainer .CodeMirror,
-.feeds .list ul li a .svg {
+.feeds .list ul li a .svg,
+.flex-item .flex-item-body {
     color: var(--text);
 }
 
@@ -216,6 +221,14 @@ b:hover,
 }
 
 /* NAVBAR */
+
+#navbar {
+    border-bottom: 1px solid var(--transparency-light-35) !important;
+}
+#navbar a.item:hover, #navbar button.item:hover {
+    background: rgba(var(--accent-color), .5);
+}
+
 .following.bar.light {
     background-color: transparent;
     border-bottom: 1px solid transparent;
@@ -243,8 +256,8 @@ b:hover,
 .ui.secondary.menu .active.item,
 .ui.secondary.menu .active.item:hover {
     box-shadow: none;
-    background: var(--transparency-dark-05);
+    background: rgb(var(--accent-color));
-    color: var(--text-hover);
+    color: var(--label-text-color) !important;
 }
 
 /* UI */
@@ -259,6 +272,10 @@ b:hover,
     box-shadow: 0 1px 2px 0 rgba(0, 0, 0, .1);
 }
 
+.ui.menu .item:before, .ui.vertical.menu .item:before {
+    background: var(--transparency-light-35);
+}
+
 .organization.settings .ui.vertical.menu {
     display: block;
     flex-direction: column;
@@ -461,8 +478,8 @@ b:hover,
 
 .ui.secondary.pointing.menu .active.item,
 .ui.secondary.pointing.menu .active.item:hover {
-    border-color: currentColor;
+    border-color: currentColor !important;
-    color: rgb(var(--accent-color));
+    color: rgb(var(--accent-color)) !important;
 }
 
 .ui.tabular.menu .item {
@@ -662,8 +679,8 @@ svg.vch__wrapper .vch__months__labels__wrapper text.vch__month__label[data-v-a9c
 
 .ui.menu .active.item:hover,
 .ui.vertical.menu .active.item:hover {
-    background: var(--transparency-dark-25);
+    background: rgb(var(--accent-color),.5) !important;
-    color: var(--text-hover);
+    color: var(--label-text-color) !important;
 }
 
 .ui.menu a.item:hover {
@@ -870,6 +887,7 @@ td.blob-excerpt {
 .ui.cards>.card {
     background: var(--transparency-dark-15);
     box-shadow: none;
+    border: 1px solid var(--transparency-light-35);
 }
 
 .ui.cards a.card:hover,
@@ -891,7 +909,10 @@ a.ui.card:hover {
 
 .ui.card>.content,
 .ui.cards>.card>.content {
-    border-color: rgb(255 255 255 / 10%);
+    border-color: var(--transparency-light-35) !important;
+}
+.user.profile .ui.card .extra.content>ul>li:not(:last-child) {
+    border-bottom: 1px solid var(--transparency-light-35);
 }
 
 .ui.ui.menu .item.disabled {
@@ -1194,7 +1215,7 @@ footer {
 .ui.toggle.checkbox input:focus:checked~label,
 .ui.checkbox input:focus~label,
 .ui.checkbox input:focus~label:after {
-    color: var(--label-text-color) !important;
+    color: var(--text) !important;
 }
 
 .ui.blue.button,
@@ -1203,6 +1224,7 @@ footer {
 .ui.primary.buttons .button {
     background-color: var(--button-color) !important;
     color: var(--button-text) !important;
+    border-color: var(--button-color) !important;
 }
 
 .ui.primary.button:hover,
@@ -1216,6 +1238,7 @@ footer {
     background-color: var(--button-color-hover) !important;
     color: var(--button-text) !important;
     box-shadow: inset 0 0 0 1px transparent !important;
+    border-color: var(--button-color-hover) !important;
 }
 
 .ui.teal.button,
@@ -1280,12 +1303,13 @@ footer {
 .ui.button {
     background: var(--button-color);
     color: var(--button-text);
-    border: 1px solid rgb(255 255 255 / 10%);
+    border: 1px solid var(--button-color) !important;
 }
 
 .ui.button:hover {
     background: var(--button-color-hover);
     color: var(--button-text);
+    border: 1px solid var(--button-color-hover) !important;
 }
 
 .ui.basic.blue.button,
@@ -1388,6 +1412,10 @@ a.ui.basic.label:hover,
     color: var(--button-text);
 }
 */
+.ui.green.labels .label, .ui.ui.ui.green.label, .ui.green.button, .ui.green.buttons .button, .ui.green.button:focus, .ui.green.buttons .button:focus {
+    background-color: rgb(var(--accent-color));
+    color: var(--label-text-color);
+}
 .ui.label,
 .ui.menu .item>.label {
     background-color: rgb(var(--accent-color));
@@ -1418,7 +1446,7 @@ a.ui.labels .label:hover {
     border: 1px solid transparent;
 }
 
-.repository #commits-table td.sha .sha.label .detail.icon,
+/* .repository #commits-table td.sha .sha.label .detail.icon,
 .repository #repo-files-table .sha.label .detail.icon,
 .repository .timeline-item.commits-list .singular-commit .sha.label .detail.icon {
     background: var(--transparency-dark-25);
@@ -1428,7 +1456,7 @@ a.ui.labels .label:hover {
     border-left: 1px solid var(--text-hover);
     border-top-left-radius: 0;
     border-bottom-left-radius: 0;
-}
+} */
 
 .repository.file.list #repo-files-table tbody .svg.octicon-file-directory,
 .repository.file.list #repo-files-table tbody .svg.octicon-file-submodule {
@@ -1651,4 +1679,18 @@ input::selection {
 
 .ui.link.list.list a.item:hover, .ui.link.list.list .item a:not(.ui):hover, .ui.link.list.list a.item:active, .ui.link.list.list .item a:not(.ui):active {
     color: var(--button-text-hover);
+}
+
+
+/* OTHER */
+
+.divider:not(.divider-text),.ui.dropdown .menu>.divider {
+    border-top: 1px solid var(--transparency-light-35);
+}
+
+
+#notification_table {
+    background: var(--transparency-dark-15);
+    border: 1px solid var(--transparency-light-15);
+    border-radius: var(--border-radius);
 }

css/community-theme-options/blackberry-abyss.css

@@ -20,7 +20,7 @@
   --link-color-hover: rgb(100, 119, 139);
   --label-text-color: #fff;
 
-  --text:#ddd;
+  --text:#eee;
   --text-hover: #fff;
   --text-muted: #999;
 

css/community-theme-options/blackberry-amethyst.css

@@ -18,7 +18,7 @@
   --link-color-hover: rgb(217, 164, 217);
   --label-text-color: #fff;
 
-  --text:#ddd;
+  --text:#eee;
   --text-hover: #fff;
   --text-muted: #999;
 

css/community-theme-options/blackberry-carol.css

@@ -25,7 +25,7 @@
   --link-color-hover: #fff;
   --label-text-color: rgb(32, 32, 32);
 
-  --text:#ddd;
+  --text:#eee;
   --text-hover: #fff;
   --text-muted: #999;
 

css/community-theme-options/blackberry-dreamscape.css

@@ -21,7 +21,7 @@
   --link-color-hover: #e2c9cc;
   --label-text-color: #fff;
 
-  --text:#ddd;
+  --text:#eee;
   --text-hover: #fff;
   --text-muted: #999;
 

css/community-theme-options/blackberry-flamingo.css

@@ -19,7 +19,7 @@
   --link-color-hover: #e2c9cc;
   --label-text-color: hsla(0, 18%, 5%, 0.95);
 
-  --text:#ddd;
+  --text:#eee;
   --text-hover: #fff;
   --text-muted: #999;
 

css/community-theme-options/blackberry-hearth.css

@@ -20,7 +20,7 @@
   --link-color-hover: #e2c9cc;
   --label-text-color: hsla(0, 18%, 5%, 0.95);
 
-  --text:#ddd;
+  --text:#eee;
   --text-hover: #fff;
   --text-muted: #999;
 

css/community-theme-options/blackberry-martian.css

@@ -20,7 +20,7 @@
   --link-color-hover: #2e5135;
   --label-text-color: hsla(0, 18%, 5%, 0.95);
 
-  --text:#ddd;
+  --text:#eee;
   --text-hover: #fff;
   --text-muted: #999;
 

css/community-theme-options/blackberry-pumpkin.css

@@ -21,7 +21,7 @@
   --link-color-hover: #bd6500;
   --label-text-color: hsla(0, 18%, 5%, 0.95);
 
-  --text:#ddd;
+  --text:#eee;
   --text-hover: #fff;
   --text-muted: #999;
 

css/community-theme-options/blackberry-royal.css

@@ -19,7 +19,7 @@
   --link-color-hover: rgb(184, 159, 141);
   --label-text-color: hsla(0, 18%, 5%, 0.95);
 
-  --text:#ddd;
+  --text:#eee;
   --text-hover: #fff;
   --text-muted: #999;
 

css/community-theme-options/blackberry-shadow.css

@@ -18,7 +18,7 @@
   --link-color-hover: rgb(81, 101, 114, .8);
   --label-text-color: #eee;
 
-  --text:#ddd;
+  --text:#eee;
   --text-hover: #fff;
   --text-muted: #999;
 

css/community-theme-options/blackberry-solar.css

@@ -19,7 +19,7 @@
   --link-color-hover: rgb(246, 211, 101, .8);
   --label-text-color: hsla(0, 18%, 5%, 0.95);
 
-  --text:#ddd;
+  --text:#eee;
   --text-hover: #fff;
   --text-muted: #999;
 

css/community-theme-options/blackberry-vanta.css

@@ -18,7 +18,7 @@
   --link-color-hover: #fff;
   --label-text-color: black;
     
-  --text:#a5a5a5;
+  --text:#eee;
   --text-hover: #fff;
   --text-muted: #999;
 

docker-mods/nginx-proxy-manager/root/etc/cont-init.d/98-themepark

@@ -1,4 +1,4 @@
-#!/command/with-contenv bash 
+#!/command/with-contenv bash
 
 echo '--------------------------------------'
 echo '| Nginx Proxy Manager theme.park Mod |' 

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

@@ -11,6 +11,11 @@ echo -e "Variables set:\\n\
 'TP_SCHEME'=${TP_SCHEME}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
+if [[ "${TP_HOTIO}" = true ]]; then
+    echo 'Changing to Hotio file path!'
+    APP_FILEPATH='/app/bin'
+fi
+
 # Set default
 if [[ -z ${TP_DOMAIN} ]]; then
     echo 'No domain set, defaulting to theme-park.dev'
@@ -38,17 +43,17 @@ if [[ -z ${TP_THEME} ]]; then
     TP_THEME='organizr'
 fi
 
-# Adding stylesheets     
+# Adding stylesheets
-if ! grep -q "${TP_DOMAIN}/css/base" /usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html; then
+if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html; then
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/base\/plex\/plex-base.css'><\/head> /g" /usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
+    sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/base\/plex\/plex-base.css'><\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
-    sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" /usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
+    sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
     printf 'Stylesheet set to %s\n' "${TP_THEME}"
     if [[ -n ${TP_ADDON} ]]; then
         for addon in $(echo "$TP_ADDON" | tr "|" " "); do
-        sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/addons\/plex\/${addon}\/${addon}.css'><\/head> /g" /usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
+        sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/addons\/plex\/${addon}\/${addon}.css'><\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
         printf 'Added custom addon: %s\n\n' "${addon}"
         done
     fi

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

@@ -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 /tmp \
+    && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://' | sed 's/-.*//'); \
+fi
+
 if ! [[ -x "$(command -v git)" ]]; then
 echo '--------------------------'
 echo '| Installing git package |'
@@ -46,6 +52,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
@@ -81,13 +88,16 @@ 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
+    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
     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
 

linux-amd64.Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.16
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19
 
 # set version label
 ARG BUILD_DATE

linux-arm64.Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.16
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19
 
 # set version label
 ARG BUILD_DATE