Merge pull request #420 from GilbN/develop

1.10.2
2024-08-18 07:59:37 +02:00 · 2022-09-03 18:29:19 +02:00 · 2022-09-03 18:29:19 +02:00 · eec160de00
commit eec160de00
parent bbef7be033 7eed146bb2
8 changed files with 262 additions and 38 deletions
--- a/css/addons/sonarr/sonarr-text-logo/sonarr-text-logo.css
+++ b/css/addons/sonarr/sonarr-text-logo/sonarr-text-logo.css
@ -0,0 +1,38 @@
+@media (min-width: 752px) {
+    [class*="PageHeader-logo-"]  {
+        display: none !important;
+    }
+    [class*="PageHeader-logoContainer-"]:before {
+        background-image: url("/css/addons/sonarr/sonarr-text-logo/sonarr-text.png");
+        display: inline-block;
+		margin-left: 15px;
+        width: 124px; 
+        height: 40px;
+        content:"";
+        background-size:  cover;
+        -webkit-background-size:  cover;
+        -moz-background-size:  cover;
+        -o-background-size: cover;
+    }    
+} 
+
+
+[class*="LoadingPage-logoFull-"] {
+    display: none !important;
+}
+
+[class*="LoadingPage-page-"]:before {
+        background-image: url("/css/addons/sonarr/sonarr-text-logo/sonarr-text.png");
+        display: inline-block;
+        width: 124px; 
+        height: 40px;
+        content:"";
+        background-size:  cover;
+        -webkit-background-size:  cover;
+        -moz-background-size:  cover;
+        -o-background-size: cover;
+        margin-top: 50px;
+        margin-right: auto;
+        margin-left: auto;
+
+}
--- a/css/addons/sonarr/sonarr-text-logo/sonarr-text.png
+++ b/css/addons/sonarr/sonarr-text-logo/sonarr-text.png
--- a/css/base/calibreweb/calibreweb-base.css
+++ b/css/base/calibreweb/calibreweb-base.css
@ -14,16 +14,17 @@
 /* Set theme to CaliBlur in UI Configuration -> View Configuration -> Theme -> CaliBlur -> Submit */
 /* APP VARS*/

-@import url("/css/defaults/placeholders.css");
-@import url("/css/defaults/transparent.css");
+ @import url("/css/defaults/placeholders.css");
+ @import url("/css/defaults/transparent.css");

 :root {
-    --color-background: var(--main-bg-color);
-    --color-primary: rgb(var(--accent-color));
-    --color-secondary: var(--button-color);
-    --color-secondary-hover: var(--button-color-hover);
-    --color-background-mobile: var(--main-bg-color);
-  }
+     --color-background: var(--main-bg-color);
+     --color-primary: rgb(var(--accent-color));
+     --color-secondary: var(--button-color);
+     --color-secondary-hover: var(--button-color-hover);
+     --color-background-mobile: var(--main-bg-color);
+ }
+
 *,
 *:focus,
 *:active,
@ -32,11 +33,23 @@
     outline: none !important;
 }

+ body:not(.blur):not(.login):not(.me):not(.author):not(.editbook):not(.upload):not(.shelfedit):not(.langlist):not(.authorlist):not(.serieslist):not(.catlist):not(.shelforder):not(.admin):not(.modal-open)>div.container-fluid>div.row-fluid>div.col-sm-10:after {
+     background: var(--main-bg-color) !important;
+     background-image: none !important;
+ }
+
 body:not(.read-frame) {
     background: var(--main-bg-color) !important;
     background-image: none;
 }

+ body.advsearch:not(.blur)>div.container-fluid>div.row-fluid>div.col-sm-10>div.col-sm-8:before,
+ body.book:not(.blur)>div.container-fluid>div.row-fluid>div.col-sm-10>div.single:before,
+ body.stat:not(.blur)>div.container-fluid>div.row-fluid>div.col-sm-10:before,
+ body:not(.blur):not(.me):not(.author):not(.editbook):not(.upload):not(.shelfedit):not(.admin):not(.modal-open)>div.container-fluid>div.row-fluid>div.col-sm-10>div.discover:first-of-type:before {
+     background: var(--main-bg-color) !important;
+ }
+
 .blur-wrapper:after {
     background: var(--main-bg-color) !important;
 }
@ -122,6 +135,11 @@
     color: var(--text-hover)
 }

+
+ .hr {
+     background-color: var(--transparency-light-15) !important;
+ }
+
 /* LINKS */
 a,
 body.admin,
@ -152,6 +170,19 @@
     color: var(--text-hover) !important;
 }

+ .table-hover>tbody>tr:hover {
+     background-color: var(--transparency-light-10);
+ }
+
+ .table>tbody>tr>td,
+ .table>tbody>tr>th,
+ .table>tfoot>tr>td,
+ .table>tfoot>tr>th,
+ .table>thead>tr>td,
+ .table>thead>tr>th {
+     border-top: 1px solid var(--transparency-light-05);
+     background: rgba(0, 0, 0, .15);
+ }

 /* MODAL */
 .modal-content {
@ -328,14 +359,16 @@
     box-shadow: 0 0 4px rgba(0, 0, 0, 0.6);
     line-height: 24px;
 }
+
 .cover {
-    box-shadow: 0 0 4px rgba(0, 0, 0, 0.6);
-  }
-  
-  .cover .read {
-    padding: 0 0;
-    line-height: 15px;
-  }
-  body.serieslist.grid-view div.container-fluid > div > div.col-sm-10::before {
-    display: none;
-  }
+     box-shadow: 0 0 4px rgba(0, 0, 0, 0.6);
+ }
+
+ .cover .read {
+     padding: 0 0;
+     line-height: 15px;
+ }
+
+ body.serieslist.grid-view div.container-fluid>div>div.col-sm-10::before {
+     display: none;
+ }
--- a/css/base/emby/emby-base.css
+++ b/css/base/emby/emby-base.css
@ -235,7 +235,8 @@ html {
    .raised:not(.nobackdropfilter) {
        background: rgba(85, 85, 85, .3);
        -webkit-backdrop-filter: saturate(1.8) blur(1.5em);
-        backdrop-filter: saturate(1.8) blur(1.5em)
+        backdrop-filter: saturate(1.8) blur(1.5em);
+        color: var(--transparency-light-95);
    }

    .dialog-blur,
--- a/css/base/uptime-kuma/uptime-kuma-base.css
+++ b/css/base/uptime-kuma/uptime-kuma-base.css
@ -66,6 +66,9 @@ a:hover:not(.btn),
 a,
 .nav-link,
 .dark a,
+.dark .nav-link,
+.dark a:not(.btn),
+.dark .table,
 .dark .nav-link {
    color: var(--link-color);
 }
@ -75,19 +78,41 @@ a,
    text-decoration: underline;
 }

-
+mark,
+.mark {
+    padding: 0 0.3em;
+    background-color: rgb(var(--accent-color));
+    color: var(--label-text-color);
+}

 /* CARDS */
 .shadow-box,
-.dark .shadow-box {
+.dark .shadow-box,
+.dark .shadow-box:not(.alert) {
    box-shadow: 0px 0px 20px 10px #0000001a;
-    background: var(--transparency-light-10);
+    background: var(--transparency-dark-25);
+}
+
+.dark .settings-content .settings-content-header {
+    background: transparent !important;
+}
+
+.dark .list-header {
+    background: transparent !important;
+}
+
+.settings-content .settings-content-header {
+    border-bottom: 1px solid var(--transparency-light-10) !important;
 }

 .list .item:hover {
    background: var(--transparency-light-15) !important;
 }

+.list-header {
+    border-bottom: 1px solid var(--transparency-light-15) !important;
+}
+
 .dark .list .item.active,
 .list .item.active {
    background: var(--transparency-dark-25) !important;
@ -119,6 +144,16 @@ td {
    color: var(--text);
 }

+.table {
+    --bs-table-hover-bg: var(--transparency-dark-15) !important;
+    --bs-table-hover-color: var(--text-hover) !important;
+}
+
+.dark .table-hover>tbody>tr:hover>* {
+    --bs-table-accent-bg: var(--transparency-dark-15);
+    color: var(--text-hover);
+}
+

 /* MENUS */
 .dropdown-menu {
@ -142,6 +177,19 @@ td {
    background: var(--drop-down-menu-bg) !important;
 }

+.dropdown-item-text {
+    color: var(--text);
+}
+
+.dropdown-profile-pic .dropdown-menu .dropdown-divider {
+    border-top: 1px solid var(--transparency-light-25) !important;
+}
+
+.dark .dropdown-profile-pic.dropdown-menu.dropdown-item.active {
+    color: var(--text-hover);
+    background-color: var(--transparency-dark-15) !important;
+}
+
 /* HEADER */
 .dark header,
 #app>div>header {
@ -155,13 +203,15 @@ td {
    color: var(--button-text);
 }

-.btn-primary {
+.btn-primary,
+.btn-info {
    color: var(--button-text);
    background-color: var(--button-color);
    border-color: var(--button-color);
 }

-.btn-primary:hover {
+.btn-primary:hover,
+.btn-info:hover {
    color: var(--button-text-hover);
    background-color: var(--button-color-hover);
    border-color: var(--button-color-hover);
@ -203,7 +253,7 @@ td {

 .btn-outline-primary,
 .btn-outline-secondary {
-    color: var(--button-text);
+    color: var(--button-color);
    border-color: var(--button-color);
 }

@ -270,19 +320,25 @@ td {
 .form-control {
    color: var(--text);
    background: var(--transparency-dark-25);
-    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='#ffffff' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e");
    background-repeat: no-repeat;
 }

 .dark .form-select:focus,
-.dark .form-control:focus,
-.form-select:focus,
-.form-control:focus {
+.form-select:focus {
+    color: var(--text-color);
    background: var(--drop-down-menu-bg);
    box-shadow: 0 0 0 0.25rem rgba(var(--accent-color), 0.25);
    border-color: rgba(var(--accent-color), 0.25);
 }

+.dark .form-control:focus,
+.form-control:focus {
+    color: var(--text-color);
+    background: var(--transparency-dark-35);
+    box-shadow: 0 0 0 0.25rem rgba(var(--accent-color), 0.25);
+    border-color: rgba(var(--accent-color), 0.25);
+}
+
 .dark .form-control,
 .dark .form-select,
 .form-select,
@ -290,7 +346,11 @@ td {
    border-color: #0000;
 }

-
+.input-group-text {
+    color: var(--button-text);
+    background-color: var(--button-color);
+    border: 1px solid var(--button-color);
+}

 .form-check-input:checked {
    background-color: var(--button-color);
@ -300,13 +360,12 @@ td {
 .form-check-input[type=checkbox]:indeterminate {
    background-color: var(--button-color);
    border-color: var(--button-color);
-    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'%3e%3cpath fill='none' stroke='%23fff' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='M6 10h8'/%3e%3c/svg%3e")
 }

 .dark .multiselect__content-wrapper,
 .multiselect__content-wrapper {
    background: var(--drop-down-menu-bg) !important;
-    border-color: transparent !important;
+    border-color: var(--transparency-light-15) !important;
 }

 .multiselect {
@ -316,20 +375,29 @@ td {
 .multiselect__option--highlight {
    background: rgb(var(--accent-color)) !important;
    outline: none;
-    color: #fff
+    color: var(--label-text-color) !important;
 }

 .multiselect__option--highlight:after {
    content: attr(data-select);
    background: rgb(var(--accent-color)) !important;
-    color: #fff
+    color: var(--label-text-color);
+}
+
+.multiselect__option--selected:after {
+    content: attr(data-selected);
+    color: var(--label-text-color) !important;
 }

 .multiselect__option--selected,
 .dark .multiselect__option--selected {
    background: var(--transparency-dark-45);
-    color: var(--text-hover);
-    font-weight: 700;
+    color: var(--text-hover) !important;
+}
+
+.dark .multiselect__option--selected::after,
+.multiselect__option--selected::after {
+    color: var(--text-hover) !important;
 }

 .multiselect__tag,
@ -393,4 +461,87 @@ td {
    -webkit-background-size: auto, cover;
    -moz-background-size: auto, cover;
    -o-background-size: auto, cover;
+}
+
+.vue-image-crop-upload .vicp-wrap {
+    -webkit-box-shadow: 0 1px 3px 0 rgb(0 0 0 / 23%);
+    box-shadow: 0 1px 3px rgb(0 0 0 / 23%);
+    background-color: var(--modal-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;
+}
+
+/* SETTINGS */
+
+.settings-menu .active .menu-item {
+    background: var(--transparency-dark-15) !important;
+}
+
+.settings-menu .menu-item:hover {
+    background: var(--transparency-light-10) !important;
+}
+
+h5.settings-subheading:after,
+.settings-subheading.h5:after {
+    border-bottom: 1px solid var(--transparency-light-10);
+}
+
+.dark .cert-exp-days .cert-exp-day-row,
+.cert-exp-days .cert-exp-day-row {
+    border-bottom: 1px solid var(--transparency-light-10) !important;
+}
+
+[contenteditable=true] {
+    background-color: var(--transparency-dark-25);
+}
+
+[contenteditable=true]:hover {
+    background-color: var(--transparency-dark-35);
+}
+
+[dir=ltr] .sidebar .sidebar-footer {
+    border-right: 1px solid var(--transparency-light-10) !important;
+    left: 0;
+}
+
+.sidebar .sidebar-footer {
+    border-top: 1px solid var(--transparency-light-10) !important;
+    background-color: var(--transparency-light-10) !important;
+}
+
+.item:hover {
+    background-color: rgb(var(--accent-color), .10) !important;
+}
+
+@media (max-width: 550px) {
+    .dark .table-shadow-box tbody .shadow-box {
+        background-color: transparent !important;
+    }
+
+    .dark .table-hover>tbody>tr:hover>* {
+        --bs-table-accent-bg: transparent color: var(--text-hover);
+    }
+
+    .dark .table-shadow-box tbody .shadow-box td {
+        border-bottom: 1px solid var(--transparency-light-10);
+    }
+}
+
+.dark .monitor-list .item:hover,
+.dark .monitor-list .item.active,
+.monitor-list .item.active,
+.monitor-list .item:hover {
+    background-color: rgb(var(--accent-color), .10);
+}
+
+.active.dropdown-item.active,
+.dark .dropdown-profile-pic .dropdown-menu .dropdown-item.active,
+#app>div>header>ul>li>div>ul>li>a.active {
+    background: var(--transparency-dark-25) !important;
+    background-color: var(--transparency-dark-25) !important;
 }
--- a/css/defaults/transparent.css
+++ b/css/defaults/transparent.css
@ -25,4 +25,5 @@
    --transparency-light-45: rgba(255, 255, 255, .45);
    --transparency-light-50: rgba(255, 255, 255, .50);
    --transparency-light-55: rgba(255, 255, 255, .55);
+    --transparency-light-95: rgba(255, 255, 255, .95);
    }
--- a/docker-mods/librespeed/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/librespeed/root/etc/cont-init.d/98-themepark
@ -39,7 +39,7 @@ if [[ -z ${TP_THEME} ]]; then
 fi

 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}/css/base" /usr/share/webapps/librespeed/index.html; then
+if ! grep -q "${TP_DOMAIN}/css/base" /app/www/public/index.html; then
    echo '---------------------------'
    echo '|  Adding the stylesheet  |'
    echo '---------------------------'
--- 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
@ -4,7 +4,7 @@ echo '--------------------------------------'
 echo '| Nginx Proxy Manager theme.park Mod |' 
 echo '--------------------------------------'

-if [ -d "/app/frontend" ] then
+if [[ -d "/app/frontend" ]]; then
    APP_FILEPATH='/app/frontend/' # jc21/nginx-proxy-manager
 else
    APP_FILEPATH='/opt/nginx-proxy-manager/frontend/' # jlesage/nginx-proxy-manager