Skip to content

Commit

Permalink
Merge pull request #377 from GilbN/develop
Browse files Browse the repository at this point in the history 
1.9.2
  • Loading branch information
@GilbN
GilbN committed May 14, 2022
2 parents ec2ccbf + 340139b commit dc1b64c
Show file tree
Hide file tree
Showing 16 changed files with 65 additions and 21 deletions.
4 changes: 2 additions & 2 deletions css/base/grafana/organizr-dashboard.css
View file
Expand Up @@ -250,8 +250,8 @@ div.flot-text {
@import url(/css/base/grafana/grafana-base.css);

:root {
--main-bg-color: url("/resources/blur-noise.png"), url("/resources/preset-light2.png") center center/cover no-repeat fixed;
--modal-bg-color: url("/resources/blur-noise.png"), url("/resources/preset-dark2.png") center center/cover no-repeat fixed;
--main-bg-color: url(/resources/blur-noise.png), url(/resources/preset-light2.png) center center/cover no-repeat fixed;
--modal-bg-color: url(/resources/blur-noise.png), url(/resources/preset-dark2.png) center center/cover no-repeat fixed;

--button-color: #cc7b19;
--button-color-hover: #e59029;
Expand Down
2 changes: 1 addition & 1 deletion css/base/guacamole/guacamole-base.css
View file
Expand Up @@ -230,7 +230,7 @@ textarea {
}

.loading::before {
background-image: url('/resources/guacamole/cog.png');
background-image: url(/resources/guacamole/cog.png);
}

table.sorted th.sort-primary.sort-descending:after {
Expand Down
12 changes: 8 additions & 4 deletions css/base/organizr/organizr-base.css
View file
Expand Up @@ -150,16 +150,16 @@ h6 {
color: var(--text-hover);
}

.btn:not(.btn-danger):not(.bg-plex):not(.btn-youtube):not(.btn-info.btn-circle):not(.btn-success),
.btn:not(.btn-danger):not(.bg-plex):not(.btn-youtube):not(.btn-info.btn-circle):not(.btn-success):not(.log-label):not(.log-details),
.cbutton {
background: var(--button-color);
border-color: var(--button-color);
color: var(--button-text);
}

.btn:hover:not(.btn-danger):not(.bg-plex):not(.btn-youtube):not(.btn-info.btn-circle):not(.btn-success),
.btn:active:not(.btn-danger):not(.bg-plex):not(.btn-youtube):not(.btn-info.btn-circle):not(.btn-success),
.btn:focus:not(.btn-danger):not(.bg-plex):not(.btn-youtube):not(.btn-info.btn-circle):not(.btn-success),
.btn:hover:not(.btn-danger):not(.bg-plex):not(.btn-youtube):not(.btn-info.btn-circle):not(.btn-success):not(.log-label):not(.log-details),
.btn:active:not(.btn-danger):not(.bg-plex):not(.btn-youtube):not(.btn-info.btn-circle):not(.btn-success):not(.log-label):not(.log-details),
.btn:focus:not(.btn-danger):not(.bg-plex):not(.btn-youtube):not(.btn-info.btn-circle):not(.btn-success):not(.log-label):not(.log-details),
.cbutton:hover {
background: var(--button-color-hover);
border-color: var(--button-color-hover);
Expand Down Expand Up @@ -2429,6 +2429,10 @@ input:active:not(select),
border: 1px solid rgba(120, 130, 140, 0.4);
}

select:focus {
background: var(--drop-down-menu-bg);
color: var(--text);
}

.cp-container .cp-pills li a {
padding: 5px;
Expand Down
3 changes: 2 additions & 1 deletion css/base/plex/plex-base.css
View file
Expand Up @@ -305,7 +305,8 @@ button:hover [class*="DisclosureArrow-disclosureArrow-"] {
}

[class*="PivotTab-selectedButton-"]:after,
[class*="TabButton-selectedButton-"]:after {
[class*="TabButton-selectedButton-"]:after,
[class*="PageHeaderTabButton-isSelected-"]:after {
background-color: rgb(var(--accent-color)) !important;
}

Expand Down
2 changes: 1 addition & 1 deletion css/base/rutorrent/rutorrent-base.css
View file
Expand Up @@ -1625,7 +1625,7 @@ div#dlgEditRatioRules {
}

#autodl-multiselect-header {
background-image: url("/resources/rutorrent/dlg-autodl-irc.gif");
background-image: url(/resources/rutorrent/dlg-autodl-irc.gif");
}

.shieven {
Expand Down
4 changes: 2 additions & 2 deletions css/community-theme-options/blackberry-carol.css
View file
@@ -1,5 +1,5 @@
:root {
--main-bg-color: url("/resources/blur-noise.png"),
--main-bg-color: url(/resources/blur-noise.png),
radial-gradient(at center center, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.9) 120%) center center/cover no-repeat fixed,
radial-gradient(at bottom center, rgba(0, 0, 0, 0.15), hsla(0, 14%, 18%, 0.45), hsla(0, 18%, 5%, 0.6)) center center/cover no-repeat fixed,
radial-gradient(at bottom center, rgba(167, 6, 6, 0.15), hsla(0, 14%, 18%, 0), hsla(0, 18%, 5%, 0)) center center/cover no-repeat fixed,
Expand Down Expand Up @@ -34,7 +34,7 @@
--plex-poster-unwatched: rgb(100, 15, 15);
--petio-spinner: invert(68%) sepia(13%) saturate(766%) hue-rotate(170deg) brightness(90%) contrast(79%); /* Made with https://codepen.io/jsm91/embed/ZEEawyZ */
--gitea-color-primary-dark-4: 100, 15, 15;
--overseerr-gradient: url("/resources/blur-noise.png"),
--overseerr-gradient: url(/resources/blur-noise.png),
radial-gradient(at center center, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.9) 120%) center center/cover no-repeat fixed,
radial-gradient(at bottom center, rgba(0, 0, 0, 0.15), hsla(0, 14%, 18%, 0.45), hsla(0, 18%, 5%, 0.6)) center center/cover no-repeat fixed,
radial-gradient(at bottom center, rgba(167, 6, 6, 0.15), hsla(0, 14%, 18%, 0), hsla(0, 18%, 5%, 0)) center center/cover no-repeat fixed,
Expand Down
2 changes: 1 addition & 1 deletion css/community-theme-options/mind.css
View file
@@ -1,6 +1,6 @@
:root {
--main-bg-color: radial-gradient(ellipse at center bottom, rgba(255, 242, 0, .7) 0%, #0d0400 80%, rgba(0, 0, 0, 1) 100%) center center/cover no-repeat fixed,
url("/resources/mind.jpg") center center/cover no-repeat fixed;
url(/resources/mind.jpg) center center/cover no-repeat fixed;
--modal-bg-color: linear-gradient(180deg, rgba(51, 49, 0, 1) 0%, #000 100%) center center/cover no-repeat fixed;
--modal-header-color: linear-gradient(180deg, rgba(51, 49, 0, 1) 0%, #000 100%) center center/cover no-repeat fixed;
--modal-footer-color: linear-gradient(180deg, rgba(51, 49, 0, 1) 0%, #000 100%) center center/cover no-repeat fixed;
Expand Down
2 changes: 1 addition & 1 deletion css/community-theme-options/power.css
View file
@@ -1,6 +1,6 @@
:root {
--main-bg-color: radial-gradient(ellipse at center bottom, rgba(166, 40, 140, .7) 0%, rgba(11,8,51,1) 80%, rgba(0,0,0,1) 100%) center center/cover no-repeat fixed,
url("/resources/power.jpg") center center/cover no-repeat fixed;
url(/resources/power.jpg) center center/cover no-repeat fixed;
--modal-bg-color: linear-gradient(180deg, rgba(35, 0, 57, 1) 0%, #000 100%) center center/cover no-repeat fixed;
--modal-header-color: linear-gradient(180deg, rgba(35, 0, 57, 1) 0%, #000 100%) center center/cover no-repeat fixed;
--modal-footer-color: linear-gradient(180deg, rgba(35, 0, 57, 1) 0%, #000 100%) center center/cover no-repeat fixed;
Expand Down
2 changes: 1 addition & 1 deletion css/community-theme-options/reality.css
View file
@@ -1,6 +1,6 @@
:root {
--main-bg-color: radial-gradient(ellipse at center bottom, rgba(232, 11, 11, 0.7) 0%, #08000d 80%, rgba(0,0,0,1) 100%) center center/cover no-repeat fixed,
url("/resources/reality.jpg") center center/cover no-repeat fixed;
url(/resources/reality.jpg) center center/cover no-repeat fixed;
--modal-bg-color: linear-gradient(180deg, rgba(102, 5, 5, 1) 0%, #000 100%) center center/cover no-repeat fixed;
--modal-header-color: linear-gradient(180deg, rgba(102, 5, 5, 1) 0%, #000 100%) center center/cover no-repeat fixed;
--modal-footer-color: linear-gradient(180deg, rgba(102, 5, 5, 1) 0%, #000 100%) center center/cover no-repeat fixed;
Expand Down
2 changes: 1 addition & 1 deletion css/community-theme-options/soul.css
View file
@@ -1,6 +1,6 @@
:root {
--main-bg-color: radial-gradient(ellipse at center bottom, rgba(255, 153, 0, .7) 0%, #3c0015 80%, rgba(0, 0, 0, 1) 100%) center center/cover no-repeat fixed,
url("/resources/soul.jpg") center center/cover no-repeat fixed;
url(/resources/soul.jpg) center center/cover no-repeat fixed;
--modal-bg-color: linear-gradient(180deg, rgba(140, 64, 2, 1) 0%, #3c0015 100%) center center/cover no-repeat fixed;
--modal-header-color: linear-gradient(180deg, rgba(140, 64, 2, 1) 0%, #3c0015 100%) center center/cover no-repeat fixed;
--modal-footer-color: linear-gradient(180deg, rgba(140, 64, 2, 1) 0%, #3c0015 100%) center center/cover no-repeat fixed;
Expand Down
2 changes: 1 addition & 1 deletion css/community-theme-options/space.css
View file
@@ -1,6 +1,6 @@
:root {
--main-bg-color: radial-gradient(ellipse at center bottom, rgba(0, 98, 255, .7) 0%, #020013 80%, rgb(0, 0, 0) 100%) center center/cover no-repeat fixed,
url("/resources/space.jpg") center center/cover no-repeat fixed;
url(/resources/space.jpg) center center/cover no-repeat fixed;
--modal-bg-color: linear-gradient(180deg, rgb(0, 57, 148) 0%, #10003c 100%) center center/cover no-repeat fixed;
--modal-headercolor: linear-gradient(180deg, rgb(0, 57, 148) 0%, #10003c 100%) center center/cover no-repeat fixed;
--modal-footer-color: linear-gradient(180deg, rgb(0, 57, 148) 0%, #10003c 100%) center center/cover no-repeat fixed;
Expand Down
2 changes: 1 addition & 1 deletion css/community-theme-options/time.css
View file
@@ -1,6 +1,6 @@
:root {
--main-bg-color: radial-gradient(ellipse at center bottom, rgba(109, 247, 81, .7) 0%, #00130c 80%, rgb(0, 0, 0) 100%) center center/cover no-repeat fixed,
url("/resources/time.jpg") center center/cover no-repeat fixed;
url(/resources/time.jpg) center center/cover no-repeat fixed;
--modal-bg-color: linear-gradient(180deg, rgba(2, 77, 0, 1) 0%, #00130c 100%) center center/cover no-repeat fixed;
--modal-header-color: linear-gradient(180deg, rgba(2, 77, 0, 1) 0%, #00130c 100%) center center/cover no-repeat fixed;
--modal-footer-color: linear-gradient(180deg, rgba(2, 77, 0, 1) 0%, #00130c 100%) center center/cover no-repeat fixed;
Expand Down
8 changes: 8 additions & 0 deletions css/defaults/servarr-base.css
View file
Expand Up @@ -444,6 +444,14 @@ a:hover {
border-top: 1px solid var(--transparency-light-25);
}

[class*="TablePager-records-"] {
color: var(--text);
}

[class*="TablePager-disabledPageButton-"] {
color: var(--text-muted);
}

/* TOP MENU */
[class*="PageToolbar-toolbar-"] {
background: var(--transparency-dark-25);
Expand Down
30 changes: 30 additions & 0 deletions css/theme-options/maroon.css
View file
@@ -0,0 +1,30 @@
:root {
--main-bg-color: radial-gradient( circle farthest-corner at 48.4% 47.5%, rgba(76,21,51,1) 0%, rgba(34,10,37,1) 90% ) center center/cover no-repeat fixed;

--modal-bg-color: radial-gradient( circle farthest-corner at 48.4% 47.5%, rgba(76,21,51,1) 0%, rgba(34,10,37,1) 90% ) center center/cover no-repeat fixed;
--modal-header-color: radial-gradient( circle farthest-corner at 48.4% 47.5%, rgba(76,21,51,1) 0%, rgba(34,10,37,1) 90% ) center center/cover no-repeat fixed;
--modal-footer-color: radial-gradient( circle farthest-corner at 48.4% 47.5%, rgba(76,21,51,1) 0%, rgba(34,10,37,1) 90% ) center center/cover no-repeat fixed;

--drop-down-menu-bg: #204c80;

--button-color: #7b154d;
--button-color-hover: rgb(150, 26, 94);
--button-text: #eee;
--button-text-hover: #FFF;

--accent-color: 208, 103, 160;
--accent-color-hover: rgb(var(--accent-color),.8);
--queue-color: #6b5;
--link-color: rgb(162, 28, 101);
--link-color-hover: rgb(150, 26, 94);

--text:#dadada;
--text-hover: #fff;
--text-muted: #999;

--arr-queue-color: rgb(0, 255, 157);
--plex-poster-unwatched: rgb(123, 21, 77);
--petio-spinner: invert(13%) sepia(77%) saturate(2418%) hue-rotate(306deg) brightness(94%) contrast(98%); /* Made with https://codepen.io/jsm91/embed/ZEEawyZ */
--gitea-color-primary-dark-4: 150, 26, 94;
--overseerr-gradient: linear-gradient(0deg, rgba(76,21,51,.9) 0%, rgb(34,10,37,.9) 100%) center center/cover no-repeat fixed;
}
8 changes: 4 additions & 4 deletions css/theme-options/plex.css
View file
@@ -1,8 +1,8 @@
:root {
/*
--main-bg-color: url("/resources/blur-noise.png"), url("/resources/preset-light2.png") center center/cover no-repeat fixed;
--modal-bg-color: url("/resources/blur-noise.png"), url("/resources/preset-dark2.png") center center/cover no-repeat fixed;
--main-bg-color: url("/resources/blur-noise.png") repeat scroll 0% 0%, radial-gradient(circle at 0% 100%, rgba(54, 66, 84, 0.55) 0%, rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 100% 100%, rgba(113, 135, 153, 0.55) 0%, rgba(113, 135, 153, 0.043) 70%, rgba(113, 135, 153, 0) 80%), radial-gradient(circle at 100% 0%, rgba(54, 66, 84, 0.55) 0%, rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 0% 0%, rgba(91, 114, 135, 0.55) 0%, rgba(91, 114, 135, 0.043) 70%, rgba(91, 114, 135, 0) 80%), rgb(0, 0, 0) center center/cover no-repeat fixed;
--main-bg-color: url(/resources/blur-noise.png), url(/resources/preset-light2.png) center center/cover no-repeat fixed;
--modal-bg-color: url(/resources/blur-noise.png), url(/resources/preset-dark2.png) center center/cover no-repeat fixed;
--main-bg-color: url(/resources/blur-noise.png) repeat scroll 0% 0%, radial-gradient(circle at 0% 100%, rgba(54, 66, 84, 0.55) 0%, rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 100% 100%, rgba(113, 135, 153, 0.55) 0%, rgba(113, 135, 153, 0.043) 70%, rgba(113, 135, 153, 0) 80%), radial-gradient(circle at 100% 0%, rgba(54, 66, 84, 0.55) 0%, rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 0% 0%, rgba(91, 114, 135, 0.55) 0%, rgba(91, 114, 135, 0.043) 70%, rgba(91, 114, 135, 0) 80%), rgb(0, 0, 0) center center/cover no-repeat fixed;
*/
--main-bg-color: radial-gradient(circle farthest-side at 0% 100%, rgb(47, 47, 47) 0%, rgba(47, 47, 47, 0) 100%), radial-gradient(circle farthest-side at 100% 100%, rgb(63, 63, 63) 0%, rgba(63, 63, 63, 0) 100%), radial-gradient(circle farthest-side at 100% 0%, rgb(76, 76, 76) 0%, rgba(76, 76, 76, 0) 100%), radial-gradient(circle farthest-side at 0% 0%, rgb(58, 58, 58) 0%, rgba(58, 58, 58, 0) 100%), black center center/cover no-repeat fixed;
--modal-bg-color: #282828;
Expand Down Expand Up @@ -31,5 +31,5 @@
--plex-poster-unwatched: #e5a00d;
--petio-spinner: invert(0%) sepia(0%) saturate(100%) hue-rotate(0deg) brightness(100%) contrast(100%);/* Made with https://codepen.io/jsm91/embed/ZEEawyZ */
--gitea-color-primary-dark-4: 255, 193, 7;
--overseerr-gradient: url("/resources/blur-noise.png") repeat scroll 0% 0%, radial-gradient(circle at 0% 100% , rgba(54, 66, 84, 0.55) 0% , rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 100% 100%, rgba(113, 135, 153, 0.55) 0%, rgba(113, 135, 153, 0.043) 70%, rgba(113, 135, 153, 0) 80%) center center/cover no-repeat fixed , radial-gradient(circle at 100% 0%, rgba(54, 66, 84, 0.55) 0%, rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 0% 0%, rgba(91, 114, 135, 0.55) 0%, rgba(91, 114, 135, 0.043) 70%, rgba(91, 114, 135, 0) 80%) center center/cover no-repeat fixed , rgb(0, 0, 0,.9) center center/cover no-repeat fixed;
--overseerr-gradient: url(/resources/blur-noise.png) repeat scroll 0% 0%, radial-gradient(circle at 0% 100% , rgba(54, 66, 84, 0.55) 0% , rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 100% 100%, rgba(113, 135, 153, 0.55) 0%, rgba(113, 135, 153, 0.043) 70%, rgba(113, 135, 153, 0) 80%) center center/cover no-repeat fixed , radial-gradient(circle at 100% 0%, rgba(54, 66, 84, 0.55) 0%, rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 0% 0%, rgba(91, 114, 135, 0.55) 0%, rgba(91, 114, 135, 0.043) 70%, rgba(91, 114, 135, 0) 80%) center center/cover no-repeat fixed , rgb(0, 0, 0,.9) center center/cover no-repeat fixed;
}
1 change: 1 addition & 0 deletions docker/root/defaults/default
View file
Expand Up @@ -20,6 +20,7 @@ server {
alias /config/www/;
sub_filter_types *;
sub_filter 'url("/css/' 'url("/themepark/css/';
sub_filter 'url(/resources/' 'url(/themepark/resources/';
sub_filter_once off;
try_files $uri $uri/ /index.html;
}
Expand Down

0 comments on commit dc1b64c

Please sign in to comment.