diff --git a/css/addons/plex/plex-alt-logo/plex-alt-logo.css b/css/addons/plex/plex-alt-logo/plex-alt-logo.css index 8476b3a6..5d0e4e4b 100644 --- a/css/addons/plex/plex-alt-logo/plex-alt-logo.css +++ b/css/addons/plex/plex-alt-logo/plex-alt-logo.css @@ -1,4 +1,4 @@ -[class*="NavBar-plexLogo-"] { +[class*="NavBar-logoContainer-"] { background-image: url("/theme.park/css/addons/plex/plex-alt-logo/SeekPng.com_your-logo-here-png_2467553.png"); background-position: 50%; background-repeat: no-repeat; @@ -7,6 +7,6 @@ width: 40px; } -[class*="NavBar-plexLogo-"] svg { +[class*="NavBar-logoContainer-"] svg { display: none; -} \ No newline at end of file +} diff --git a/css/addons/radarr/radarr-4k-logo/radarr-4k-logo.css b/css/addons/radarr/radarr-4k-logo/radarr-4k-logo.css index 77e5ee16..36c0588c 100644 --- a/css/addons/radarr/radarr-4k-logo/radarr-4k-logo.css +++ b/css/addons/radarr/radarr-4k-logo/radarr-4k-logo.css @@ -24,4 +24,9 @@ width: 120px; height: 40px; opacity: 1; +} + +.panel-header > img.logo { + content: url("/theme.park/css/addons/radarr/radarr-4k-logo/radarr4k-v3.png"); + width: auto; } \ No newline at end of file diff --git a/css/addons/sonarr/sonarr-4k-logo/sonarr-4k-logo.css b/css/addons/sonarr/sonarr-4k-logo/sonarr-4k-logo.css index 60095fa1..5c05002b 100644 --- a/css/addons/sonarr/sonarr-4k-logo/sonarr-4k-logo.css +++ b/css/addons/sonarr/sonarr-4k-logo/sonarr-4k-logo.css @@ -13,4 +13,8 @@ [class*="LoadingPage-logoFull-"] { content: url("/theme.park/css/addons/sonarr/sonarr-4k-logo/sonarr-4k.png"); opacity: 1; +} + +.panel-header > img.logo { + content: url("/theme.park/css/addons/sonarr/sonarr-4k-logo/sonarr-4k.png"); } \ No newline at end of file diff --git a/css/addons/sonarr/sonarr-4k-text-logo/sonarr-4k-text-logo.css b/css/addons/sonarr/sonarr-4k-text-logo/sonarr-4k-text-logo.css index ae047ffe..0cdd69f4 100644 --- a/css/addons/sonarr/sonarr-4k-text-logo/sonarr-4k-text-logo.css +++ b/css/addons/sonarr/sonarr-4k-text-logo/sonarr-4k-text-logo.css @@ -11,7 +11,7 @@ [class*="PageHeader-logo-"] { width: 32px; height: 32px; - margin-left: 0px; + margin-left: 0; content: url("/theme.park/css/addons/sonarr/sonarr-4k-logo/sonarr-4k.png"); } } @@ -24,4 +24,9 @@ width: 120px; height: 40px; opacity: 1; +} + +.panel-header > img.logo { + content: url("/theme.park/css/addons/sonarr/sonarr-4k-text-logo/sonarr-4k-text.png"); + width: auto; } \ No newline at end of file diff --git a/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue-logo.css b/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue-logo.css new file mode 100644 index 00000000..935ca302 --- /dev/null +++ b/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue-logo.css @@ -0,0 +1,20 @@ +@media (min-width: 752px) { + [class*="PageHeader-logo-"] { + content: url("/theme.park/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue.png"); + } +} + +@media only screen and (max-width: 768px) { + [class*="PageHeader-logo-"] { + content: url("/theme.park/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue.png"); + } +} + +[class*="LoadingPage-logoFull-"] { + content: url("/theme.park/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue.png"); + opacity: 1; +} + +.panel-header > img.logo { + content: url("/theme.park/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue.png"); +} \ No newline at end of file diff --git a/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue.png b/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue.png new file mode 100644 index 00000000..75bd857e Binary files /dev/null and b/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue.png differ diff --git a/css/addons/sonarr/sonarr-anime-blue-text-logo/sonarr-anime-blue-text-logo.css b/css/addons/sonarr/sonarr-anime-blue-text-logo/sonarr-anime-blue-text-logo.css new file mode 100644 index 00000000..e14f2933 --- /dev/null +++ b/css/addons/sonarr/sonarr-anime-blue-text-logo/sonarr-anime-blue-text-logo.css @@ -0,0 +1,32 @@ +@media (min-width: 752px) { + [class*="PageHeader-logo-"] { + content: url("/theme.park/css/addons/sonarr/sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png"); + margin-left: 15px; + width: 120px; + height: 40px; + } +} + +@media only screen and (max-width: 768px) { + [class*="PageHeader-logo-"] { + width: 32px; + height: 32px; + margin-left: 0; + content: url("/theme.park/css/addons/sonarr/sonarr-anime-blue-logo/sonarr-anime-blue.png"); + } +} + +[class*="LoadingPage-logoFull-"] { + content: url("/theme.park/css/addons/sonarr/sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png"); + margin-top: 50px; + margin-right: auto; + margin-left: auto; + width: 120px; + height: 40px; + opacity: 1; +} + +.panel-header > img.logo { + content: url("/theme.park/css/addons/sonarr/sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png"); + width: auto; +} \ No newline at end of file diff --git a/css/addons/sonarr/sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png b/css/addons/sonarr/sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png new file mode 100644 index 00000000..c2df9b96 Binary files /dev/null and b/css/addons/sonarr/sonarr-anime-blue-text-logo/sonarr-anime-blue-text.png differ diff --git a/css/addons/sonarr/sonarr-anime-logo/sonarr-anime-logo.css b/css/addons/sonarr/sonarr-anime-logo/sonarr-anime-logo.css new file mode 100644 index 00000000..55b9d7d3 --- /dev/null +++ b/css/addons/sonarr/sonarr-anime-logo/sonarr-anime-logo.css @@ -0,0 +1,20 @@ +@media (min-width: 752px) { + [class*="PageHeader-logo-"] { + content: url("/theme.park/css/addons/sonarr/sonarr-anime-logo/sonarr-anime.png"); + } +} + +@media only screen and (max-width: 768px) { + [class*="PageHeader-logo-"] { + content: url("/theme.park/css/addons/sonarr/sonarr-anime-logo/sonarr-anime.png"); + } +} + +[class*="LoadingPage-logoFull-"] { + content: url("/theme.park/css/addons/sonarr/sonarr-anime-logo/sonarr-anime.png"); + opacity: 1; +} + +.panel-header > img.logo { + content: url("/theme.park/css/addons/sonarr/sonarr-anime-logo/sonarr-anime.png"); +} \ No newline at end of file diff --git a/css/addons/sonarr/sonarr-anime-logo/sonarr-anime.png b/css/addons/sonarr/sonarr-anime-logo/sonarr-anime.png new file mode 100644 index 00000000..209dd13f Binary files /dev/null and b/css/addons/sonarr/sonarr-anime-logo/sonarr-anime.png differ diff --git a/css/addons/sonarr/sonarr-anime-text-logo/sonarr-anime-text-logo.css b/css/addons/sonarr/sonarr-anime-text-logo/sonarr-anime-text-logo.css new file mode 100644 index 00000000..f51c28ed --- /dev/null +++ b/css/addons/sonarr/sonarr-anime-text-logo/sonarr-anime-text-logo.css @@ -0,0 +1,32 @@ +@media (min-width: 752px) { + [class*="PageHeader-logo-"] { + content: url("/theme.park/css/addons/sonarr/sonarr-anime-text-logo/sonarr-anime-text.png"); + margin-left: 15px; + width: 120px; + height: 40px; + } +} + +@media only screen and (max-width: 768px) { + [class*="PageHeader-logo-"] { + width: 32px; + height: 32px; + margin-left: 0; + content: url("/theme.park/css/addons/sonarr/sonarr-anime-logo/sonarr-anime.png"); + } +} + +[class*="LoadingPage-logoFull-"] { + content: url("/theme.park/css/addons/sonarr/sonarr-anime-text-logo/sonarr-anime-text.png"); + margin-top: 50px; + margin-right: auto; + margin-left: auto; + width: 120px; + height: 40px; + opacity: 1; +} + +.panel-header > img.logo { + content: url("/theme.park/css/addons/sonarr/sonarr-anime-text-logo/sonarr-anime-text.png"); + width: auto; +} \ No newline at end of file diff --git a/css/addons/sonarr/sonarr-anime-text-logo/sonarr-anime-text.png b/css/addons/sonarr/sonarr-anime-text-logo/sonarr-anime-text.png new file mode 100644 index 00000000..50e9d374 Binary files /dev/null and b/css/addons/sonarr/sonarr-anime-text-logo/sonarr-anime-text.png differ diff --git a/css/addons/sonarr/sonarr-logo.md b/css/addons/sonarr/sonarr-logo.md new file mode 100644 index 00000000..742e0e2e --- /dev/null +++ b/css/addons/sonarr/sonarr-logo.md @@ -0,0 +1,74 @@ +# sonarr-*-logo + +Source files: + +1. [sonarr-logo.psd](sonarr-logo.psd) contains 256x256 sonarr logo and 3 more layers: + +- sonarr-4k-logo +- sonarr-anime-logo +- sonarr-anime-blue-logo + +1. [sonarr-text.psd](sonarr-text.psd) contains 900x29 sonarr with text logo and 2 more layers: + - sonarr-anime-text-logo + - sonarr-anime-blue-text-logo + +Preview: + + + + + + + + + + + + + + + + + + + + + + + + + + + +
sonarr-4k-logo sonarr-4k-logo sonarr-4k-logosonarr-4k-logosonarr-4k-logosonarr-4k-logo
sonarr-anime-logo sonarr-anime-logo sonarr-anime-logosonarr-anime-logosonarr-anime-logosonarr-anime-logo
sonarr-anime-blue-logo sonarr-anime-blue-logo sonarr-anime-blue-logosonarr-anime-blue-logosonarr-anime-blue-logosonarr-anime-blue-logo
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
sonarr-text-logo sonarr-4k-logo sonarr-4k-logosonarr-4k-logosonarr-4k-logo
sonarr-4k-text-logo sonarr-anime-logo sonarr-anime-logosonarr-anime-logosonarr-anime-logo
sonarr-anime-text-logo sonarr-anime-blue-logo sonarr-anime-blue-logosonarr-anime-blue-logosonarr-anime-blue-logo
sonarr-anime-blue-text-logo sonarr-anime-blue-logo sonarr-anime-blue-logosonarr-anime-blue-logosonarr-anime-blue-logo
diff --git a/css/addons/sonarr/sonarr-logo.psd b/css/addons/sonarr/sonarr-logo.psd new file mode 100644 index 00000000..8f9bcd68 Binary files /dev/null and b/css/addons/sonarr/sonarr-logo.psd differ diff --git a/css/addons/sonarr/sonarr-text-logo/sonarr-text-logo.css b/css/addons/sonarr/sonarr-text-logo/sonarr-text-logo.css index 729092af..45de737c 100644 --- a/css/addons/sonarr/sonarr-text-logo/sonarr-text-logo.css +++ b/css/addons/sonarr/sonarr-text-logo/sonarr-text-logo.css @@ -16,4 +16,9 @@ width: 120px; height: 40px; opacity: 1; +} + +.panel-header > img.logo { + content: url("/theme.park/css/addons/sonarr/sonarr-text-logo/sonarr-text.png"); + width: auto; } \ No newline at end of file diff --git a/css/addons/sonarr/sonarr-text.psd b/css/addons/sonarr/sonarr-text.psd new file mode 100644 index 00000000..d1e6aec2 Binary files /dev/null and b/css/addons/sonarr/sonarr-text.psd differ diff --git a/css/addons/unraid/login-page/custom_login.sh b/css/addons/unraid/login-page/custom_login.sh index 558521b1..c8eda6c3 100644 --- a/css/addons/unraid/login-page/custom_login.sh +++ b/css/addons/unraid/login-page/custom_login.sh @@ -55,7 +55,7 @@ fi case ${DOMAIN} in *"github.io"*) echo "Switching to github.io URL style" - DOMAIN="${DOMAIN}\/theme.park" + DOMAIN="${DOMAIN}/theme.park" ;; esac diff --git a/css/base/qbittorrent/qbittorrent-base.css b/css/base/qbittorrent/qbittorrent-base.css index 633e894c..6717f1a4 100644 --- a/css/base/qbittorrent/qbittorrent-base.css +++ b/css/base/qbittorrent/qbittorrent-base.css @@ -208,6 +208,7 @@ label { #desktopNavbar ul li a { color: var(--text); + padding: 1px 10px; } #desktopNavbar ul li a:hover { @@ -408,8 +409,8 @@ li.divider { /* Sidemenu */ .selectedFilter { - background-color: var(--button-color); - color: var(--button-text); + background-color: var(--button-color) !important; + color: var(--button-text) !important; } .selectedFilter:before { @@ -489,6 +490,7 @@ hr { .toolbarTabs { background: var(--transparency-dark-25) !important; + margin: 0px 5px 0 0 !important; } .progressbar_dark { @@ -662,4 +664,9 @@ select:focus { .select-watched-folder-editable { background-color: var(--transparency-dark-05); border: solid var(--transparency-light-10) 1px; +} + +#torrentsFilterToolbar { + float: right; + margin-right: .5rem; } \ No newline at end of file diff --git a/css/base/unraid/unraid-base.css b/css/base/unraid/unraid-base.css index f5d9f0fe..b583acea 100644 --- a/css/base/unraid/unraid-base.css +++ b/css/base/unraid/unraid-base.css @@ -100,9 +100,23 @@ pre { border-radius: 0px 0px 0px 25px; } +.nav-tile { + background-color: var(--transparency-dark-50); + overflow-x: auto; +} + +div.title { + border-bottom: 1px solid var(--transparency-light-15); + background-color: var(--transparency-dark-45); +} + #nav-block #nav-item:focus:after, #nav-block #nav-item:hover:after, -#nav-block #nav-item.active:after { +#nav-block #nav-item.active:after, +.nav-item:focus:after, +.nav-item:hover:after, +.nav-user.show:hover:after { + background-color: var(--accent-color-hover); background: var(--accent-color-hover); } @@ -129,14 +143,18 @@ textarea { /*DASHBOARD*/ table.share_status.dashboard { background: var(--transparency-dark-15); - border: 1px solid rgba(255, 255, 255, .25); + border: 1px solid var(--transparency-light-25); } table.share_status.dashboard tr>td.next { - border-top: 1px solid rgba(255, 255, 255, .25); + border-top: 1px solid var(--transparency-light-25); color: var(--text-hover); } +table.share_status.dashboard tbody { + border: 1px solid var(--transparency-light-15); +} + span.outer.solid { background-color: transparent; } @@ -177,7 +195,7 @@ table.tablesorter thead tr th { /*MAIN*/ #title { - border-bottom: 1px solid rgba(255, 255, 255, .25); + border-bottom: 1px solid var(--transparency-light-25); background: var(--transparency-dark-50); color: var(--text-hover); } @@ -202,15 +220,15 @@ table.disk_status tbody tr:nth-child(even) { } table.disk_status thead tr:last-child { - border-bottom: 1px solid rgb(160, 160, 160); + border-bottom: 1px solid var(--transparency-light-25); } table.tablesorter thead tr { - border-bottom: rgba(255, 255, 255, .25) 1px solid; + border-bottom: var(--transparency-light-25) 1px solid; } table tbody tr.tr_last { - border-top: 1px solid rgba(255, 255, 255, .25); + border-top: 1px solid var(--transparency-light-25); } table.share_status tbody tr.warn { @@ -286,7 +304,7 @@ a.button:hover, /* USERS */ div.user-list { - border: 1px solid rgba(255, 255, 255, .15); + border: 1px solid var(--transparency-light-15); background: var(--transparency-light-05); } @@ -458,7 +476,7 @@ li.caMenuItem:hover { .ca_holder { background: var(--transparency-dark-25) !important; - border-color: rgba(255, 255, 255, 0.1) !important; + border-color: var(--transparency-light-10) !important; } .ca_holder:hover { @@ -656,9 +674,13 @@ div.shade-black { /* MODAL */ -/* .sweet-alert { - background: var(--modal-bg-color) !important; -} */ +.sweet-alert, .sweet-alert .sa-icon.sa-success .sa-fix { + background-color: var(--modal-bg-color); +} + +.sweet-alert.nchan h2 { + background-color: var(--transparency-light-15); +} .showSweetAlert:not([data-has-cancel-button="false"]), .swal-overlay--show-modal .swal-modal { diff --git a/css/base/vuetorrent/vuetorrent-base.css b/css/base/vuetorrent/vuetorrent-base.css index 17b75dd8..6dbfe6c3 100644 --- a/css/base/vuetorrent/vuetorrent-base.css +++ b/css/base/vuetorrent/vuetorrent-base.css @@ -15,6 +15,10 @@ @import url("/theme.park/css/defaults/placeholders.css"); @import url("/theme.park/css/defaults/transparent.css"); +:root { + --v-theme-accent: var(--accent-color): +} + @media (max-width: 720px) { .modal__body, @@ -59,6 +63,11 @@ html { border-radius: 20px } +/* OVERLAY */ +.v-overlay__scrim { + background: rgb(var(--accent-color)); +} + /* TEXT */ .h1, .h2, @@ -78,6 +87,10 @@ p, color: var(--text-hover); } +.text-accent { + color: rgb(var(--accent-color)) !important; +} + .v-select__slot>label { color: var(--text-hover) !important; } @@ -113,11 +126,11 @@ p, } /* TOP NAVBAR */ -[class*="theme--"].v-app-bar.v-toolbar.v-sheet { +[class*="theme--"].v-app-bar.v-toolbar { color: var(--text) !important; } -.v-app-bar.v-app-bar--hide-shadow { +.v-toolbar[class*="theme--"] { background: var(--transparency-dark-25) !important; } @@ -137,7 +150,7 @@ p, } /* SIDE MENU */ -.v-application .primary { +.v-application .primary,.v-navigation-drawer { background: var(--transparency-dark-25) !important; color: var(--text) !important; } @@ -157,12 +170,25 @@ p, .v-navigation-drawer--is-mobile:not(.v-navigation-drawer--close), .v-navigation-drawer--temporary:not(.v-navigation-drawer--close), .v-navigation-drawer--is-mobile:not(.v-navigation-drawer--close), - .v-navigation-drawer--temporary:not(.v-navigation-drawer--close) { + .v-navigation-drawer--temporary:not(.v-navigation-drawer--close), + [class*="theme--"].v-app-bar.v-toolbar { -webkit-backdrop-filter: blur(10px); backdrop-filter: blur(10px); } } +/* STATS */ +[class*="v-theme--"] .bg-secondary { + background-color: var(--transparency-light-15) !important; + border-color: rgba(255, 255, 255, .15) !important; +} + +/* CURRENT SPEED */ +.v-navigation-drawer__content .v-sheet[class*="theme--"].bg-primary { + background-color: transparent !important; + border-color: rgba(255, 255, 255, .15) !important; +} + /* slightly transparent fallback for Firefox (not supporting backdrop-filter) */ @supports not ((-webkit-backdrop-filter: none) or (backdrop-filter: none)) { @@ -184,6 +210,31 @@ p, caret-color: var(--v-download-base) !important; } +/* TABS */ + +.v-slide-group.v-tabs.v-tabs--horizontal.bg-primary{ + background: var(--transparency-dark-25) !important; +} + +.v-btn.v-slide-group-item--active.v-tab--selected { + background: var(--transparency-dark-35) !important; +} + +/* BUTTON */ +.v-btn--variant-elevated, .v-btn--variant-flat { + background: var(--button-color) !important; + color: var(--button-text) !important; +} +.bg-red { + --v-theme-overlay-multiplier: var(--v-theme-red-overlay-multiplier); + background-color: rgb(var(--v-theme-red)) !important; + color: rgb(var(--v-theme-on-red)) !important; +} + +.v-btn--icon.v-btn--density-compact { + background: transparent !important; +} + /* MODAL */ .v-dialog [class*="theme--"].v-card, .v-dialog [class*="theme--"].v-tabs-items, @@ -295,6 +346,15 @@ button>.v-btn--is-elevated .v-btn--has-bg.v-icon__svg { .v-text-field--outlined fieldset { border-color: rgba(255, 255, 255, .1) !important; } +.v-field.v-field--variant-solo.v-theme--darkTheme { + background: var(--transparency-dark-25) !important; +} +.v-field--variant-solo, .v-field--variant-solo-filled, .v-field--variant-solo-inverted { + background: var(--transparency-dark-25) !important; + border-color: transparent; + color: rgba(var(--v-theme-on-surface), var(--v-high-emphasis-opacity)); + box-shadow: 0 3px 1px -2px var(--v-shadow-key-umbra-opacity, rgba(0, 0, 0, .2)), 0 2px 2px 0 var(--v-shadow-key-penumbra-opacity, rgba(0, 0, 0, .14)), 0 1px 5px 0 var(--v-shadow-key-ambient-opacity, rgba(0, 0, 0, .12)); +} /* DASHBOARD */ @@ -425,10 +485,23 @@ button>.v-btn--is-elevated .v-btn--has-bg.v-icon__svg { color: var(--text) !important; } -.v-menu__content [class*="theme--"][class*="theme--"].v-list { +.v-menu__content [class*="theme--"][class*="theme--"].v-list,.v-menu [class*="theme--"][class*="theme--"].v-list { background: var(--drop-down-menu-bg) } +.v-expansion-panel { + background-color: var(--drop-down-menu-bg) !important; + color: var(--text); +} +.v-expansion-panel-title__overlay { + background-color: var(--drop-down-menu-bg) !important; +} + +.v-bottom-navigation { + background: var(--drop-down-menu-bg); + color: var(--text); +} + [class*="theme--"].v-icon { color: rgb(var(--accent-color)) !important; } @@ -437,8 +510,21 @@ button>.v-btn--is-elevated .v-btn--has-bg.v-icon__svg { border-color: rgba(255, 255, 255, .2) !important; } +.v-menu>.v-overlay__content>.v-card, .v-menu>.v-overlay__content>.v-sheet, .v-menu>.v-overlay__content>.v-list { + background: rgb(var(--drop-down-menu-bg)); + border-radius: inherit; + overflow: auto; + height: 100%; + box-shadow: 0 5px 5px -3px var(--transparency-light-10) !important; +} + +.v-list-item--variant-plain, .v-list-item--variant-outlined, .v-list-item--variant-text, .v-list-item--variant-tonal { + background: transparent; + color: var(--link-color); +} + /* TABLE */ -[class*="theme--"].v-data-table { +[class*="theme--"].v-data-table,.v-table { background: transparent; color: var(--text); } @@ -512,6 +598,7 @@ button>.v-btn--is-elevated .v-btn--has-bg.v-icon__svg { /* SETTING */ [class*="theme--"].v-list { - background: var(--transparency-light-05); + background: var(--transparency-dark-10); color: rgba(0,0,0,.87); -} \ No newline at end of file +} + diff --git a/css/community-theme-options/catppuccin-frappe.css b/css/community-theme-options/catppuccin-frappe.css new file mode 100644 index 00000000..945e4323 --- /dev/null +++ b/css/community-theme-options/catppuccin-frappe.css @@ -0,0 +1,34 @@ +:root { + --main-bg-color: #303446; + + --modal-bg-color: #292c3c; + --modal-header-color: #232634; + --modal-footer-color: #232634; + + --drop-down-menu-bg: #414559; + + --button-color: #414559; + --button-color-hover: #51576d; + --button-text: var(--text); + --button-text-hover: var(--text-hover); + + --accent-color: 137, 180, 250; /* Mocha Blue */ + --accent-color-hover: rgb(var(--accent-color), 0.8); + --link-color: var(--text); + --link-color-hover: #8caaee; + --label-text-color: #fff; /* have to break convention here */ + + --text: #c6d0f5; + --text-hover: var(--text); + --text-muted: a5adce; + + /* Specials */ + --arr-queue-color: #a6d189; /* Servarr apps + Bazarr */ + --plex-poster-unwatched: #ef9f76; + --petio-spinner: invert(66%) sepia(15%) saturate(1451%) hue-rotate(185deg) brightness(105%) contrast(96%); /* Made with https://codepen.io/jsm91/embed/ZEEawyZ */ /* Blue */ + --gitea-color-primary-dark-4: var(--accent-color); + --overseerr-gradient: linear-gradient( + var(--main-bg-color), + var(--main-bg-color) + ); /* Make sure this is compatible with whatever takes in the gradient */ +} diff --git a/css/community-theme-options/catppuccin-latte.css b/css/community-theme-options/catppuccin-latte.css new file mode 100644 index 00000000..56fce33c --- /dev/null +++ b/css/community-theme-options/catppuccin-latte.css @@ -0,0 +1,34 @@ +:root { + --main-bg-color: #eff1f5; + + --modal-bg-color: #e6e9ef; + --modal-header-color: #dce0e8; + --modal-footer-color: #dce0e8; + + --drop-down-menu-bg: #ccd0da; + + --button-color: #ccd0da; + --button-color-hover: #bcc0cc; + --button-text: var(--text); + --button-text-hover: var(--text-hover); + + --accent-color: 137, 180, 250; /* Mocha Blue */ + --accent-color-hover: rgb(var(--accent-color), 0.8); + --link-color: var(--text); + --link-color-hover: #1e66f5; + --label-text-color: #fff; /* have to break convention here */ + + --text: #4c4f69; + --text-hover: var(--text); + --text-muted: 6c6f85; + + /* Specials */ + --arr-queue-color: #40a02b; /* Servarr apps + Bazarr */ + --plex-poster-unwatched: #fe640b; + --petio-spinner: invert(66%) sepia(15%) saturate(1451%) hue-rotate(185deg) brightness(105%) contrast(96%); /* Made with https://codepen.io/jsm91/embed/ZEEawyZ */ /* Blue */ + --gitea-color-primary-dark-4: var(--accent-color); + --overseerr-gradient: linear-gradient( + var(--main-bg-color), + var(--main-bg-color) + ); /* Make sure this is compatible with whatever takes in the gradient */ +} diff --git a/css/community-theme-options/catppuccin-macchiato.css b/css/community-theme-options/catppuccin-macchiato.css new file mode 100644 index 00000000..4e533f96 --- /dev/null +++ b/css/community-theme-options/catppuccin-macchiato.css @@ -0,0 +1,34 @@ +:root { + --main-bg-color: #24273a; + + --modal-bg-color: #1e2030; + --modal-header-color: #181926; + --modal-footer-color: #181926; + + --drop-down-menu-bg: #363a4f; + + --button-color: #363a4f; + --button-color-hover: #494d64; + --button-text: var(--text); + --button-text-hover: var(--text-hover); + + --accent-color: 137, 180, 250; /* Mocha Blue */ + --accent-color-hover: rgb(var(--accent-color), 0.8); + --link-color: var(--text); + --link-color-hover: #8aadf4; + --label-text-color: #fff; /* have to break convention here */ + + --text: #cad3f5; + --text-hover: var(--text); + --text-muted: a5adcb; + + /* Specials */ + --arr-queue-color: #a6da95; /* Servarr apps + Bazarr */ + --plex-poster-unwatched: #f5a97f; + --petio-spinner: invert(66%) sepia(15%) saturate(1451%) hue-rotate(185deg) brightness(105%) contrast(96%); /* Made with https://codepen.io/jsm91/embed/ZEEawyZ */ /* Blue */ + --gitea-color-primary-dark-4: var(--accent-color); + --overseerr-gradient: linear-gradient( + var(--main-bg-color), + var(--main-bg-color) + ); /* Make sure this is compatible with whatever takes in the gradient */ +} diff --git a/css/community-theme-options/catppuccin-mocha.css b/css/community-theme-options/catppuccin-mocha.css new file mode 100644 index 00000000..3522092d --- /dev/null +++ b/css/community-theme-options/catppuccin-mocha.css @@ -0,0 +1,34 @@ +:root { + --main-bg-color: #1e1e2e; + + --modal-bg-color: #181825; + --modal-header-color: #11111b; + --modal-footer-color: #11111b; + + --drop-down-menu-bg: #313244; + + --button-color: #313244; + --button-color-hover: #45475a; + --button-text: var(--text); + --button-text-hover: var(--text-hover); + + --accent-color: 137, 180, 250; /* Mocha Blue */ + --accent-color-hover: rgb(var(--accent-color), 0.8); + --link-color: var(--text); + --link-color-hover: #89b4fa; + --label-text-color: #fff; /* have to break convention here */ + + --text: #cdd6f4; + --text-hover: var(--text); + --text-muted: a6adc8; + + /* Specials */ + --arr-queue-color: #a6e3a1; /* Servarr apps + Bazarr */ + --plex-poster-unwatched: #fab387; + --petio-spinner: invert(66%) sepia(15%) saturate(1451%) hue-rotate(185deg) brightness(105%) contrast(96%); /* Made with https://codepen.io/jsm91/embed/ZEEawyZ */ /* Blue */ + --gitea-color-primary-dark-4: var(--accent-color); + --overseerr-gradient: linear-gradient( + var(--main-bg-color), + var(--main-bg-color) + ); /* Make sure this is compatible with whatever takes in the gradient */ +} diff --git a/docker-mods/bazarr/root/etc/cont-init.d/98-themepark b/docker-mods/bazarr/root/etc/cont-init.d/98-themepark index c3b07812..c1d0a9ca 100644 --- a/docker-mods/bazarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/bazarr/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '---------------------------' echo '| Bazarr theme.park Mod |' diff --git a/docker-mods/bazarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/bazarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index c3b07812..c1d0a9ca 100644 --- a/docker-mods/bazarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/bazarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '---------------------------' echo '| Bazarr theme.park Mod |' diff --git a/docker-mods/calibre-web/root/etc/cont-init.d/98-themepark b/docker-mods/calibre-web/root/etc/cont-init.d/98-themepark index 417aa90d..35d2e34e 100644 --- a/docker-mods/calibre-web/root/etc/cont-init.d/98-themepark +++ b/docker-mods/calibre-web/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '--------------------------------' echo '| Calibre-web theme.park Mod |' diff --git a/docker-mods/calibre-web/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/calibre-web/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 19b1417e..ee809670 100644 --- a/docker-mods/calibre-web/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/calibre-web/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '--------------------------------' echo '| Calibre-web theme.park Mod |' diff --git a/docker-mods/deluge/root/etc/cont-init.d/98-themepark b/docker-mods/deluge/root/etc/cont-init.d/98-themepark index 9e491d44..927f1fe4 100644 --- a/docker-mods/deluge/root/etc/cont-init.d/98-themepark +++ b/docker-mods/deluge/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '---------------------------' echo '| Deluge theme.park Mod |' diff --git a/docker-mods/deluge/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/deluge/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 92774460..a1348051 100644 --- a/docker-mods/deluge/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/deluge/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '---------------------------' echo '| Deluge theme.park Mod |' diff --git a/docker-mods/duplicati/root/etc/cont-init.d/98-themepark b/docker-mods/duplicati/root/etc/cont-init.d/98-themepark index ba0c0be3..86a38913 100644 --- a/docker-mods/duplicati/root/etc/cont-init.d/98-themepark +++ b/docker-mods/duplicati/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '----------------------------' echo '| Duplicati theme.park Mod |' diff --git a/docker-mods/duplicati/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/duplicati/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 1c1fa3ed..4ad3d92c 100644 --- a/docker-mods/duplicati/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/duplicati/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '----------------------------' echo '| Duplicati theme.park Mod |' diff --git a/docker-mods/emby/root/etc/cont-init.d/98-themepark b/docker-mods/emby/root/etc/cont-init.d/98-themepark index 215209dc..7085d288 100644 --- a/docker-mods/emby/root/etc/cont-init.d/98-themepark +++ b/docker-mods/emby/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '-------------------------' echo '| Emby theme.park Mod |' @@ -39,5 +39,5 @@ if [[ -z ${TP_THEME} ]]; then fi # Adding stylesheets -printf '%s\n' "@import url('${TP_SCHEME}://${TP_DOMAIN}/css/${THEME_TYPE}/${TP_THEME}.css');" "@import url('${TP_SCHEME}://${TP_DOMAIN}/css/base/emby/emby-base.css');" > /app/emby/dashboard-ui/modules/themes/light/theme.css +printf '%s\n' "@import url('${TP_SCHEME}://${TP_DOMAIN}/css/${THEME_TYPE}/${TP_THEME}.css');" "@import url('${TP_SCHEME}://${TP_DOMAIN}/css/base/emby/emby-base.css');" > /app/emby/system/dashboard-ui/modules/themes/light/theme.css printf 'Stylesheet set to %s\n' "${TP_THEME}" diff --git a/docker-mods/emby/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/emby/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 215209dc..7085d288 100644 --- a/docker-mods/emby/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/emby/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '-------------------------' echo '| Emby theme.park Mod |' @@ -39,5 +39,5 @@ if [[ -z ${TP_THEME} ]]; then fi # Adding stylesheets -printf '%s\n' "@import url('${TP_SCHEME}://${TP_DOMAIN}/css/${THEME_TYPE}/${TP_THEME}.css');" "@import url('${TP_SCHEME}://${TP_DOMAIN}/css/base/emby/emby-base.css');" > /app/emby/dashboard-ui/modules/themes/light/theme.css +printf '%s\n' "@import url('${TP_SCHEME}://${TP_DOMAIN}/css/${THEME_TYPE}/${TP_THEME}.css');" "@import url('${TP_SCHEME}://${TP_DOMAIN}/css/base/emby/emby-base.css');" > /app/emby/system/dashboard-ui/modules/themes/light/theme.css printf 'Stylesheet set to %s\n' "${TP_THEME}" diff --git a/docker-mods/jackett/root/etc/cont-init.d/98-themepark b/docker-mods/jackett/root/etc/cont-init.d/98-themepark index b55f4b76..bb5889fc 100644 --- a/docker-mods/jackett/root/etc/cont-init.d/98-themepark +++ b/docker-mods/jackett/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '---------------------------' echo '| Jackett theme.park Mod |' diff --git a/docker-mods/jackett/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/jackett/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index abaf1b50..0f9e1a54 100644 --- a/docker-mods/jackett/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/jackett/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '---------------------------' echo '| Jackett theme.park Mod |' diff --git a/docker-mods/jellyfin/root/etc/cont-init.d/98-themepark b/docker-mods/jellyfin/root/etc/cont-init.d/98-themepark index fd4b5acd..9b258f66 100644 --- a/docker-mods/jellyfin/root/etc/cont-init.d/98-themepark +++ b/docker-mods/jellyfin/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '-----------------------------' echo '| Jellyfin theme.park Mod |' diff --git a/docker-mods/jellyfin/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/jellyfin/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 18e53c79..5b49a903 100644 --- a/docker-mods/jellyfin/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/jellyfin/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '-----------------------------' echo '| Jellyfin theme.park Mod |' diff --git a/docker-mods/lazylibrarian/root/etc/cont-init.d/98-themepark b/docker-mods/lazylibrarian/root/etc/cont-init.d/98-themepark index 026eac1f..592febe1 100644 --- a/docker-mods/lazylibrarian/root/etc/cont-init.d/98-themepark +++ b/docker-mods/lazylibrarian/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '----------------------------------' echo '| Lazylibrarian theme.park Mod |' diff --git a/docker-mods/lazylibrarian/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/lazylibrarian/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index d8714131..66ca9014 100644 --- a/docker-mods/lazylibrarian/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/lazylibrarian/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '----------------------------------' echo '| Lazylibrarian theme.park Mod |' diff --git a/docker-mods/librespeed/root/etc/cont-init.d/98-themepark b/docker-mods/librespeed/root/etc/cont-init.d/98-themepark index a89ea834..06d80e42 100644 --- a/docker-mods/librespeed/root/etc/cont-init.d/98-themepark +++ b/docker-mods/librespeed/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '-------------------------------' echo '| Librespeed theme.park Mod |' diff --git a/docker-mods/librespeed/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/librespeed/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 6a46fa20..c9f3f553 100644 --- a/docker-mods/librespeed/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/librespeed/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '-------------------------------' echo '| Librespeed theme.park Mod |' diff --git a/docker-mods/lidarr/root/etc/cont-init.d/98-themepark b/docker-mods/lidarr/root/etc/cont-init.d/98-themepark index 416c756e..b6cfd96f 100644 --- a/docker-mods/lidarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/lidarr/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '---------------------------' echo '| Lidarr theme.park Mod |' @@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then done fi - sed -i "s!!${sheets}!g" "${APP_FILEPATH}" - sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" printf 'Stylesheets inserted.' fi diff --git a/docker-mods/lidarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/lidarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 387dcb9e..36f5d92f 100644 --- a/docker-mods/lidarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/lidarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '---------------------------' echo '| Lidarr theme.park Mod |' @@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then done fi - sed -i "s!!${sheets}!g" "${APP_FILEPATH}" - sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" printf 'Stylesheets inserted.' fi diff --git a/docker-mods/mylar3/root/etc/cont-init.d/98-themepark b/docker-mods/mylar3/root/etc/cont-init.d/98-themepark index 473553df..9d8e9d8d 100644 --- a/docker-mods/mylar3/root/etc/cont-init.d/98-themepark +++ b/docker-mods/mylar3/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '-------------------------' echo '| Mylar3 theme.park Mod |' diff --git a/docker-mods/mylar3/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/mylar3/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 65732690..2a17fe41 100644 --- a/docker-mods/mylar3/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/mylar3/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '-------------------------' echo '| Mylar3 theme.park Mod |' diff --git a/docker-mods/nginx-proxy-manager/root/etc/cont-init.d/98-themepark b/docker-mods/nginx-proxy-manager/root/etc/cont-init.d/98-themepark index bf9b6647..48651cf0 100644 --- a/docker-mods/nginx-proxy-manager/root/etc/cont-init.d/98-themepark +++ b/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 |' diff --git a/docker-mods/nginx-proxy-manager/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/nginx-proxy-manager/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index bf9b6647..48651cf0 100644 --- a/docker-mods/nginx-proxy-manager/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/nginx-proxy-manager/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '--------------------------------------' echo '| Nginx Proxy Manager theme.park Mod |' diff --git a/docker-mods/nzbget/root/etc/cont-init.d/98-themepark b/docker-mods/nzbget/root/etc/cont-init.d/98-themepark index b119672b..4744c11e 100644 --- a/docker-mods/nzbget/root/etc/cont-init.d/98-themepark +++ b/docker-mods/nzbget/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '---------------------------' echo '| NZBGet theme.park Mod |' diff --git a/docker-mods/nzbget/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/nzbget/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 3e94d1e1..89dd343c 100644 --- a/docker-mods/nzbget/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/nzbget/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '---------------------------' echo '| NZBGet theme.park Mod |' diff --git a/docker-mods/plex/root/etc/cont-init.d/98-themepark b/docker-mods/plex/root/etc/cont-init.d/98-themepark index ba87314a..c3675e08 100644 --- a/docker-mods/plex/root/etc/cont-init.d/98-themepark +++ b/docker-mods/plex/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '-------------------------' echo '| Plex theme.park Mod |' @@ -11,12 +11,6 @@ echo -e "Variables set:\\n\ 'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" -APP_FILEPATH='' -if [ "${TP_HOTIO}" = true ]; then - echo 'Changing to Hotio file path!' - APP_FILEPATH='/app' -fi - # Set default if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' @@ -45,16 +39,16 @@ if [[ -z ${TP_THEME} ]]; then fi # Adding stylesheets -if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html; then +if ! grep -q "${TP_DOMAIN}/css/base" /usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html + sed -i "s/<\/head>/<\/head> /g" /usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html + sed -i "s/<\/head>/<\/head> /g" /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>/<\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html + sed -i "s/<\/head>/<\/head> /g" /usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html printf 'Added custom addon: %s\n\n' "${addon}" done fi diff --git a/docker-mods/plex/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/plex/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 4d042c9a..7b4c6203 100644 --- a/docker-mods/plex/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/plex/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '-------------------------' echo '| Plex theme.park Mod |' @@ -11,12 +11,6 @@ echo -e "Variables set:\\n\ 'TP_SCHEME'=${TP_SCHEME}\\n\ 'TP_THEME'=${TP_THEME}\\n" -APP_FILEPATH='' -if [ "${TP_HOTIO}" = true ]; then - echo 'Changing to Hotio file path!' - APP_FILEPATH='/app' -fi - # Set default if [[ -z ${TP_DOMAIN} ]]; then echo 'No domain set, defaulting to theme-park.dev' @@ -45,16 +39,16 @@ if [[ -z ${TP_THEME} ]]; then fi # Adding stylesheets -if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html; then +if ! grep -q "${TP_DOMAIN}/css/base" /usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html + sed -i "s/<\/head>/<\/head> /g" /usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html + sed -i "s/<\/head>/<\/head> /g" /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>/<\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html + sed -i "s/<\/head>/<\/head> /g" /usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html printf 'Added custom addon: %s\n\n' "${addon}" done fi diff --git a/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark b/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark index 541878d5..f0228345 100644 --- a/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '---------------------------' echo '| Prowlarr theme.park Mod |' @@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then done fi - sed -i "s!!${sheets}!g" "${APP_FILEPATH}" - sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" printf 'Stylesheets inserted.' fi diff --git a/docker-mods/prowlarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/prowlarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 16b0285f..0a5ada4b 100644 --- a/docker-mods/prowlarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/prowlarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '---------------------------' echo '| Prowlarr theme.park Mod |' @@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then done fi - sed -i "s!!${sheets}!g" "${APP_FILEPATH}" - sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" printf 'Stylesheets inserted.' fi diff --git a/docker-mods/qbittorrent/Dockerfile b/docker-mods/qbittorrent/Dockerfile index 4c3ca04c..d12803c2 100644 --- a/docker-mods/qbittorrent/Dockerfile +++ b/docker-mods/qbittorrent/Dockerfile @@ -1,7 +1,7 @@ FROM scratch - LABEL maintainer="GilbN" LABEL app="Qbittorrent" + #copy local files. COPY root/ / \ No newline at end of file diff --git a/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark b/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark index 8993c58f..783c94fb 100644 --- a/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark +++ b/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '------------------------------' echo '| qBittorrent theme.park Mod |' @@ -23,17 +23,17 @@ if [ "${TP_DISABLE_THEME}" = true ]; then exit 0 fi -if ! [[ -x "$(command -v svn)" ]]; then +if ! [[ -x "$(command -v git)" ]]; then echo '--------------------------' -echo '| Installing svn package |' +echo '| Installing git package |' echo '--------------------------' if [ -x "$(command -v apk)" ]; then apk update && \ - apk add --no-cache subversion + apk add --no-cache git apk add --no-cache perl elif [ -x "$(command -v apt-get)" ]; then apt-get update && \ - apt-get install -y subversion + apt-get install -y git apt-get install -y perl fi fi @@ -80,15 +80,15 @@ if [[ ! -d /themepark ]]; then echo '---------------------------------------' echo '| Downloading WebUI files from github |' echo '---------------------------------------' - printf '\nDownloading qBittorrent webui to "/themepark"..please wait\n' - svn export --quiet https://github.com/qbittorrent/qBittorrent/trunk/src/webui/www /themepark + printf '\nDownloading qBittorrent to /temp\n' + git clone --depth 1 https://github.com/qbittorrent/qBittorrent /temp printf '\nDownload finished\n\n' - printf '\nDownloading qBittorrent webui icons to "/themepark/xxx"..please wait\n' - svn export --force --quiet https://github.com/qbittorrent/qBittorrent/trunk/src/icons /temp - cp -a /temp/. /themepark/public/icons - cp -a /temp/. /themepark/private/icons + 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 - printf '\nDownload finished\n\n' + printf '\nCleanup finished\n\n' fi sed_file(){ diff --git a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run index 08e75e25..605a4f23 100644 --- a/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run +++ b/docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run @@ -1,6 +1,6 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash -if ! [[ -x "$(command -v svn)" ]]; then - echo "subversion" >> /mod-repo-packages-to-install.list +if ! [[ -x "$(command -v git)" ]]; then + echo "git" >> /mod-repo-packages-to-install.list echo "perl" >> /mod-repo-packages-to-install.list fi 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 52892435..634b19ab 100644 --- 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 @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '------------------------------' echo '| qBittorrent theme.park Mod |' @@ -65,15 +65,15 @@ if [[ ! -d /themepark ]]; then echo '---------------------------------------' echo '| Downloading WebUI files from github |' echo '---------------------------------------' - printf '\nDownloading qBittorrent webui to "/themepark"..please wait\n' - svn export --quiet https://github.com/qbittorrent/qBittorrent/trunk/src/webui/www /themepark + printf '\nDownloading qBittorrent to /temp\n' + git clone --depth 1 https://github.com/qbittorrent/qBittorrent /temp printf '\nDownload finished\n\n' - printf '\nDownloading qBittorrent webui icons to "/themepark/xxx"..please wait\n' - svn export --force --quiet https://github.com/qbittorrent/qBittorrent/trunk/src/icons /temp - cp -a /temp/. /themepark/public/icons - cp -a /temp/. /themepark/private/icons + 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 - printf '\nDownload finished\n\n' + printf '\nCleanup finished\n\n' fi sed_file(){ diff --git a/docker-mods/radarr/root/etc/cont-init.d/98-themepark b/docker-mods/radarr/root/etc/cont-init.d/98-themepark index aaba7e32..0ea86540 100644 --- a/docker-mods/radarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/radarr/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '---------------------------' echo '| Radarr theme.park Mod |' @@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then done fi - sed -i "s!!${sheets}!g" "${APP_FILEPATH}" - sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" printf 'Stylesheets inserted.' fi diff --git a/docker-mods/radarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/radarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 555ab472..bacd704f 100644 --- a/docker-mods/radarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/radarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '---------------------------' echo '| Radarr theme.park Mod |' @@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then done fi - sed -i "s!!${sheets}!g" "${APP_FILEPATH}" - sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" printf 'Stylesheets inserted.' fi diff --git a/docker-mods/readarr/root/etc/cont-init.d/98-themepark b/docker-mods/readarr/root/etc/cont-init.d/98-themepark index ac247e57..1036e99d 100644 --- a/docker-mods/readarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/readarr/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '---------------------------' echo '| Readarr theme.park Mod |' @@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then done fi - sed -i "s!!${sheets}!g" "${APP_FILEPATH}" - sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" printf 'Stylesheets inserted.' fi diff --git a/docker-mods/readarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/readarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index b6c21926..10bc8c52 100644 --- a/docker-mods/readarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/readarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '---------------------------' echo '| Readarr theme.park Mod |' @@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then done fi - sed -i "s!!${sheets}!g" "${APP_FILEPATH}" - sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" printf 'Stylesheets inserted.' fi diff --git a/docker-mods/rutorrent/root/etc/cont-init.d/98-themepark b/docker-mods/rutorrent/root/etc/cont-init.d/98-themepark index f57b9c48..42b6c56e 100644 --- a/docker-mods/rutorrent/root/etc/cont-init.d/98-themepark +++ b/docker-mods/rutorrent/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '------------------------------' echo '| Rutorrent theme.park Mod |' diff --git a/docker-mods/rutorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/rutorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index f57b9c48..42b6c56e 100644 --- a/docker-mods/rutorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/rutorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '------------------------------' echo '| Rutorrent theme.park Mod |' diff --git a/docker-mods/sabnzbd/root/etc/cont-init.d/98-themepark b/docker-mods/sabnzbd/root/etc/cont-init.d/98-themepark index 0a26ad13..3191c72c 100644 --- a/docker-mods/sabnzbd/root/etc/cont-init.d/98-themepark +++ b/docker-mods/sabnzbd/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '----------------------------' echo '| SABnzbd theme.park Mod |' diff --git a/docker-mods/sabnzbd/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/sabnzbd/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 129cf6ea..69e39780 100644 --- a/docker-mods/sabnzbd/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/sabnzbd/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '----------------------------' echo '| SABnzbd theme.park Mod |' diff --git a/docker-mods/sonarr/root/etc/cont-init.d/98-themepark b/docker-mods/sonarr/root/etc/cont-init.d/98-themepark index 0a4a71e1..4f107e1a 100644 --- a/docker-mods/sonarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/sonarr/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '---------------------------' echo '| Sonarr theme.park Mod |' @@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then done fi - sed -i "s!!${sheets}!g" "${APP_FILEPATH}" - sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" printf 'Stylesheets inserted.' fi diff --git a/docker-mods/sonarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/sonarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 11d97d71..b7b0b135 100644 --- a/docker-mods/sonarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/sonarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '---------------------------' echo '| Sonarr theme.park Mod |' @@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then done fi - sed -i "s!!${sheets}!g" "${APP_FILEPATH}" - sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" printf 'Stylesheets inserted.' fi diff --git a/docker-mods/swag/root/etc/cont-init.d/98-themepark b/docker-mods/swag/root/etc/cont-init.d/98-themepark index 3c838be1..5e69ebf4 100644 --- a/docker-mods/swag/root/etc/cont-init.d/98-themepark +++ b/docker-mods/swag/root/etc/cont-init.d/98-themepark @@ -1,22 +1,9 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '-------------------------' echo '| SWAG theme.park Mod |' echo '-------------------------' -if ! [[ -x "$(command -v svn)" ]]; then -echo '--------------------------' -echo '| Installing svn package |' -echo '--------------------------' - if [ -x "$(command -v apk)" ]; then - apk update && \ - apk add --no-cache subversion - elif [ -x "$(command -v apt-get)" ]; then - apt-get update && \ - apt-get install -y subversion - fi -fi - # Display variables for troubleshooting echo -e "Variables set:\\n\ 'TP_BRANCH'=${TP_BRANCH}\\n" @@ -41,7 +28,7 @@ fi mkdir -p /config/www/themepark -SHA_RELEASE=$(curl -sL "https://api.github.com/repos/gilbn/theme.park/commits/${TP_BRANCH}" | jq -r '.sha'); +SHA_RELEASE=$(curl -sL "https://api.github.com/repos/themepark-dev/theme.park/commits/${TP_BRANCH}" | jq -r '.sha'); if [[ ! -f "/config/www/themepark/sha.txt" ]]; then SHA="" else @@ -50,13 +37,21 @@ fi # Downloading fresh webui files from source. if [[ $SHA != $SHA_RELEASE ]]; then echo "-----------------------------------------------------" - echo "| Downloading latest files from ${TP_BRANCH} branch |" + echo "| Cloning latest files from ${TP_BRANCH} branch |" + echo "-----------------------------------------------------" + rm -rf /tmp/themepark + git clone --depth 1 --quiet --branch ${TP_BRANCH} https://github.com/themepark-dev/theme.park.git /tmp/themepark + echo "-----------------------------------------------------" + echo "| Copying files to /config/www/themepark |" + echo "-----------------------------------------------------" + cp -a /tmp/themepark/css /config/www/themepark/ + cp -a /tmp/themepark/resources /config/www/themepark/ + cp -a /tmp/themepark/themes.json /config/www/themepark/ + cp -a /tmp/themepark/index.html /config/www/themepark/ + rm -rf /tmp/themepark + echo "-----------------------------------------------------" + echo '| Clone and copy finished |' echo "-----------------------------------------------------" - svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/css" /config/www/themepark/css - svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/resources" /config/www/themepark/resources - svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/themes.json" /config/www/themepark - svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/index.html" /config/www/themepark - printf '\nDownload finished\n\n' fi cat <<< "$SHA_RELEASE" > "/config/www/themepark/sha.txt" diff --git a/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/dependencies.d/init-mods b/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/dependencies.d/init-mods new file mode 100644 index 00000000..e69de29b diff --git a/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 962bed88..5e69ebf4 100644 --- a/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/swag/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '-------------------------' echo '| SWAG theme.park Mod |' @@ -28,7 +28,7 @@ fi mkdir -p /config/www/themepark -SHA_RELEASE=$(curl -sL "https://api.github.com/repos/gilbn/theme.park/commits/${TP_BRANCH}" | jq -r '.sha'); +SHA_RELEASE=$(curl -sL "https://api.github.com/repos/themepark-dev/theme.park/commits/${TP_BRANCH}" | jq -r '.sha'); if [[ ! -f "/config/www/themepark/sha.txt" ]]; then SHA="" else @@ -37,13 +37,21 @@ fi # Downloading fresh webui files from source. if [[ $SHA != $SHA_RELEASE ]]; then echo "-----------------------------------------------------" - echo "| Downloading latest files from ${TP_BRANCH} branch |" + echo "| Cloning latest files from ${TP_BRANCH} branch |" + echo "-----------------------------------------------------" + rm -rf /tmp/themepark + git clone --depth 1 --quiet --branch ${TP_BRANCH} https://github.com/themepark-dev/theme.park.git /tmp/themepark + echo "-----------------------------------------------------" + echo "| Copying files to /config/www/themepark |" + echo "-----------------------------------------------------" + cp -a /tmp/themepark/css /config/www/themepark/ + cp -a /tmp/themepark/resources /config/www/themepark/ + cp -a /tmp/themepark/themes.json /config/www/themepark/ + cp -a /tmp/themepark/index.html /config/www/themepark/ + rm -rf /tmp/themepark + echo "-----------------------------------------------------" + echo '| Clone and copy finished |' echo "-----------------------------------------------------" - svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/css" /config/www/themepark/css - svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/resources" /config/www/themepark/resources - svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/themes.json" /config/www/themepark - svn export --quiet --force "https://github.com/GilbN/theme.park/branches/${TP_BRANCH}/index.html" /config/www/themepark - printf '\nDownload finished\n\n' fi cat <<< "$SHA_RELEASE" > "/config/www/themepark/sha.txt" diff --git a/docker-mods/synclounge/root/etc/cont-init.d/98-themepark b/docker-mods/synclounge/root/etc/cont-init.d/98-themepark index e656a2e6..dc2abf6f 100644 --- a/docker-mods/synclounge/root/etc/cont-init.d/98-themepark +++ b/docker-mods/synclounge/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '-------------------------------' echo '| Synclounge theme.park Mod |' diff --git a/docker-mods/synclounge/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/synclounge/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 1b0a160e..e08d10bb 100644 --- a/docker-mods/synclounge/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/synclounge/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '-------------------------------' echo '| Synclounge theme.park Mod |' diff --git a/docker-mods/tautulli/root/etc/cont-init.d/98-themepark b/docker-mods/tautulli/root/etc/cont-init.d/98-themepark index 62d53187..671c4400 100644 --- a/docker-mods/tautulli/root/etc/cont-init.d/98-themepark +++ b/docker-mods/tautulli/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '-----------------------------' echo '| Tautulli theme.park Mod |' diff --git a/docker-mods/tautulli/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/tautulli/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 4013d706..23c8b38b 100644 --- a/docker-mods/tautulli/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/tautulli/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '-----------------------------' echo '| Tautulli theme.park Mod |' diff --git a/docker-mods/thelounge/root/etc/cont-init.d/98-themepark b/docker-mods/thelounge/root/etc/cont-init.d/98-themepark index ff368b08..75dcca6e 100644 --- a/docker-mods/thelounge/root/etc/cont-init.d/98-themepark +++ b/docker-mods/thelounge/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '-------------------------------' echo '| The Lounge theme.park Mod |' diff --git a/docker-mods/thelounge/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/thelounge/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 96bc372b..3ddcc06f 100644 --- a/docker-mods/thelounge/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/thelounge/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '-------------------------------' echo '| The Lounge theme.park Mod |' diff --git a/docker-mods/transmission/root/etc/cont-init.d/98-themepark b/docker-mods/transmission/root/etc/cont-init.d/98-themepark index e94de6ea..3b3334d2 100644 --- a/docker-mods/transmission/root/etc/cont-init.d/98-themepark +++ b/docker-mods/transmission/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '---------------------------------' echo '| Transmission theme.park Mod |' diff --git a/docker-mods/transmission/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/transmission/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 13bfa7ad..a0f5505c 100644 --- a/docker-mods/transmission/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/transmission/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '---------------------------------' echo '| Transmission theme.park Mod |' diff --git a/docker-mods/vuetorrent/root/etc/cont-init.d/98-themepark b/docker-mods/vuetorrent/root/etc/cont-init.d/98-themepark index 3124bd4d..7131ccba 100644 --- a/docker-mods/vuetorrent/root/etc/cont-init.d/98-themepark +++ b/docker-mods/vuetorrent/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash APP_FILEPATH='/config/qBittorrent/qBittorrent.conf' INDEX_FILEPATH='/vuetorrent/public/index.html' if [ "${TP_HOTIO}" = true ]; then @@ -55,7 +55,7 @@ if [[ -z ${TP_THEME} ]]; then fi RELEASE_FILEPATH='/vuetorrent/release.json' NEEDS_UPDATE=false -CURRENT_RELEASE=$(curl -s https://api.github.com/repos/WDaan/VueTorrent/releases/latest | jq -r ".assets[]") +CURRENT_RELEASE=$(curl -Ls https://api.github.com/repos/WDaan/VueTorrent/releases/latest | jq -r ".assets[]") # =============================================== install_deps() { @@ -146,4 +146,4 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${INDEX_FILEPATH}"; then sed -i "s/<\/body>/<\/body> /g" "${INDEX_FILEPATH}" sed -i "s/<\/body>/<\/body> /g" "${INDEX_FILEPATH}" printf 'Stylesheet set to %s on public index.html\n' "${TP_THEME}" -fi \ No newline at end of file +fi diff --git a/docker-mods/vuetorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run b/docker-mods/vuetorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run index 16645ac6..c467c3c6 100644 --- a/docker-mods/vuetorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run +++ b/docker-mods/vuetorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark-add-package/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash if ! [[ -x "$(command -v jq)" ]]; then echo "jq" >> /mod-repo-packages-to-install.list diff --git a/docker-mods/vuetorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/vuetorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 8398de61..4d1a687c 100644 --- a/docker-mods/vuetorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/vuetorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash APP_FILEPATH='/config/qBittorrent/qBittorrent.conf' INDEX_FILEPATH='/vuetorrent/public/index.html' if [ "${TP_HOTIO}" = true ]; then @@ -55,7 +55,7 @@ if [[ -z ${TP_THEME} ]]; then fi RELEASE_FILEPATH='/vuetorrent/release.json' NEEDS_UPDATE=false -CURRENT_RELEASE=$(curl -s https://api.github.com/repos/WDaan/VueTorrent/releases/latest | jq -r ".assets[]") +CURRENT_RELEASE=$(curl -Ls https://api.github.com/repos/WDaan/VueTorrent/releases/latest | jq -r ".assets[]") # =============================================== check_updates() { @@ -131,4 +131,4 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${INDEX_FILEPATH}"; then sed -i "s/<\/body>/<\/body> /g" "${INDEX_FILEPATH}" sed -i "s/<\/body>/<\/body> /g" "${INDEX_FILEPATH}" printf 'Stylesheet set to %s on public index.html\n' "${TP_THEME}" -fi \ No newline at end of file +fi diff --git a/docker-mods/whisparr/root/etc/cont-init.d/98-themepark b/docker-mods/whisparr/root/etc/cont-init.d/98-themepark index a34e6089..b1fe4f9d 100644 --- a/docker-mods/whisparr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/whisparr/root/etc/cont-init.d/98-themepark @@ -1,4 +1,4 @@ -#!/command/with-contenv bash +#!/command/with-contenv bash echo '-----------------------------' echo '| Whisparr theme.park Mod |' @@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then done fi - sed -i "s!!${sheets}!g" "${APP_FILEPATH}" - sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" printf 'Stylesheets inserted.' fi diff --git a/docker-mods/whisparr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/whisparr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index cdea12d6..86657887 100644 --- a/docker-mods/whisparr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/whisparr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash echo '-----------------------------' echo '| Whisparr theme.park Mod |' @@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then done fi - sed -i "s!!${sheets}!g" "${APP_FILEPATH}" - sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" + sed -i "s!!${sheets}!g" "${APP_FILEPATH}" + sed -i "s!!${sheets}!g" "${LOGIN_FILEPATH}" printf 'Stylesheets inserted.' fi diff --git a/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/run b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/run index 62e6d0f9..04f75f38 100644 --- a/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/run +++ b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/usr/bin/with-contenv bash # Display variables for troubleshooting echo -e "[theme.park-init] Variables set:\\n\