Merge pull request #292 from GilbN/develop

1.6.5
2024-11-04 10:12:31 +01:00 · 2021-11-16 14:03:53 +01:00 · 2021-11-16 14:03:53 +01:00 · f7238479e6
commit f7238479e6
parent b2e35a4c8e 564dd8dc65
9 changed files with 233 additions and 59 deletions
--- a/css/addons/prowlarr/prowlarr-darker/prowlarr-darker.css
+++ b/css/addons/prowlarr/prowlarr-darker/prowlarr-darker.css
@ -103,6 +103,18 @@
    color: #fff;
 }

+[class*="Label-disabled-"][class*="Label-outline-"] {
+    color: #000;
+}
+
+[class*="Label-outline-"] {
+    background-color: #989898;
+}
+
+[class*="Label-success-"] {
+    color: #000;
+}
+
 /* SETTINGS */

 [class*=Settings-link-] {
@ -116,4 +128,6 @@
    background-color: var(--drop-down-menu-bg);
    box-shadow: inset 0 1px 1px rgb(0 0 0 / 8%);
    color: #e1e2e3;
-}
+}
+
+/* BUTTONS */
--- a/css/base/lidarr/lidarr-base.css
+++ b/css/base/lidarr/lidarr-base.css
@ -42,11 +42,11 @@ body {
 }

 /* LINKS */
-[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]) {
+[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]):not([class*="Button-"]) {
    color: var(--link-color);   
   }
   
-[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]):hover {
+[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]):hover:not([class*="Button-"]):hover {
 color: var(--link-color-hover);   
 }

@ -321,6 +321,15 @@ a:hover {
    border-left: 3px solid rgb(var(--accent-color));
 }

+#sidebar-toggle-button {
+    color: var(--text);
+}
+#sidebar-toggle-button:hover,
+#sidebar-toggle-button:focus,
+#sidebar-toggle-button:active {
+    color: var(--text-hover);
+}
+
 /* LIBRARY PAGE */
 /* LIDARR SPECIFIC */
 [class*="ArtistIndexPoster-controls-"] {
@ -443,13 +452,13 @@ a:hover {
 [class*="Popover-body-"],
 [class*="Tooltip-body-"] {
    background: var(--modal-bg-color) !important;
-    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;
+    background-repeat: repeat, no-repeat !important;
+    background-attachment: fixed, fixed !important;
+    background-position: center center, center center !important;
+    background-size: auto, cover !important;
+    -webkit-background-size: auto, cover !important;
+    -moz-background-size: auto, cover !important;
+    -o-background-size: auto, cover !important;
 }

 [class*="Tooltip-tooltipContainer-"] {
@ -501,6 +510,26 @@ a:hover {
    color: var(--label-text-color);
 }

+[class*="Label-success-"] {
+    border-color: #27c24c;
+    background-color: #27c24c;
+    color: var(--label-text-color);
+}
+
+[class*="Label-disabled-"][class*="Label-outline-"] {
+    color: #000;
+}
+
+[class*="Label-outline-"] {
+    background-color: #999;
+}
+
+[class*="Label-disabled-"] {
+    border-color: #999;
+    background-color: #999;
+    color: #000;
+}
+
 /* Table options*/
 [class*="TableOptionsColumn-column-"] {
    background: rgba(0, 0, 0, .25);
--- a/css/base/plex/plex-base.css
+++ b/css/base/plex/plex-base.css
@ -118,11 +118,9 @@ a[class*="MetadataTableRow-title-"]:hover {
 }

 /* BODY */
-[class*="FullPageBackground-backgroundContainer-"] [class*="CrossFadeImage-crossFade-"],
-#plex>[class*="background-container-"]>div>div>div:nth-child(2),
-#plex>div[class*="FullPageBackground-backgroundContainer-"]>div>div:nth-child(2),
-#plex>div[class*="FullPageBackground-backgroundContainer-"]>div>div:nth-child(4) {
-  background: var(--main-bg-color) !important;
+html body,
+.application {
+  background: var(--main-bg-color);
  background-repeat: repeat, no-repeat;
  background-attachment: fixed, fixed;
  background-position: center center, center center;
@ -132,6 +130,10 @@ a[class*="MetadataTableRow-title-"]:hover {
  -o-background-size: auto, cover;
 }

+.plex-preloader-container {
+  background-color: transparent;
+}
+
 [class*="BottomBar-bottomBar-"] {
  background-color: rgb(0 0 0 / 70%);
  box-shadow: 0 0 4px 0 rgb(0 0 0 / 50%);
@ -153,7 +155,7 @@ a[class*="MetadataTableRow-title-"]:hover {
 }

 [class*="SourceSidebar-expandedSidebar-"][class*="SourceSidebar-sidebar-"] {
-  background: var(--modal-bg-color) !important;
+  background: var(--modal-bg-color);
  background-repeat: repeat, no-repeat;
  background-attachment: fixed, fixed;
  background-position: center center, center center;
@ -163,6 +165,15 @@ a[class*="MetadataTableRow-title-"]:hover {
  -o-background-size: auto, cover;
 }

+@supports (backdrop-filter: blur(1em)) or (-webkit-backdrop-filter:blur(1em)) {
+  [class*="SourceSidebar-expandedSidebar-"][class*="SourceSidebar-sidebar-"] {
+      background: var(--header-blur-background);
+      -webkit-backdrop-filter: saturate(1.8) blur(1.5em);
+      backdrop-filter: saturate(1.8) blur(1.5em);
+      background-color: rgba(0, 0, 0, .5);
+  }
+}
+
 [class*="DisclosureArrow-isSelected-"] {
  border-color: rgb(var(--accent-color));
 }
@ -269,11 +280,11 @@ button:hover [class*="DisclosureArrow-disclosureArrow-"] {
 }

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

 [class*="PivotTab-selectedButton-"]:hover:after {
-  background-color: var(--link-color-hover);
+  background-color: var(--link-color-hover) !important;
 }

 [class*="MetadataPosterCardOverlay-unplayedBadge-"],
@ -637,8 +648,9 @@ fieldset[disabled] .btn-primary:hover {
 /* SETTINGS */
 [class*="SettingsFormSection-sectionWrapper-"],
 [class*="ServerDashboardPageSection-section-"],
+[class*="SettingsFormSection-sectionWrapper-"],
 hr {
-  border-top: 2px solid rgb(255 255 255 / 30%);
+  border-top: 2px solid rgba(255, 255, 255, 0.3) !important;
 }

 [class*="SettingsFormSection-sectionWrapper-"]:last-of-type,
@ -670,7 +682,7 @@ hr {
  background-color: rgb(0 0 0 / 25%);
 }

-a>[class*="DirectoryListTableHeader-tableHeaderCell-"]:hover, 
+a>[class*="DirectoryListTableHeader-tableHeaderCell-"]:hover,
 button>[class*="DirectoryListTableHeader-tableHeaderCell-"]:hover,
 [class*="DirectoryListTableHeader-columnMenuButton-"]:hover {
  background-color: rgba(255, 255, 255, 0.1);
--- a/css/base/prowlarr/prowlarr-base.css
+++ b/css/base/prowlarr/prowlarr-base.css
@ -33,14 +33,22 @@ body {
 }

 /* LINKS */
-[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]) {
+[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]):not([class*="PageHeader-"]):not([class*="Button-small-"]) {
    color: var(--link-color);   
   }
   
-[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]):hover {
+[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]):hover:not([class*="PageHeader-translate"]):hover:not([class*="Button-small-"]):hover {
 color: var(--link-color-hover);   
 }

+[class*="PageHeaderActionsMenu-menuButton-"]:hover {
+    color: #515253;
+}
+
+[class*="PageHeader-donate-"]:hover {
+    color: #9c1f30 !important;
+}
+
 a {
    color: var(--link-color);
 }
@ -267,6 +275,15 @@ a:hover {
    border-left: 3px solid rgb(var(--accent-color));
 }

+#sidebar-toggle-button {
+    color: var(--text);
+}
+#sidebar-toggle-button:hover,
+#sidebar-toggle-button:focus,
+#sidebar-toggle-button:active {
+    color: var(--text-hover);
+}
+
 /* MOVIES PAGE */
 /* RADARR SPECIFIC */
 [class*="MovieIndexPoster-controls-"] {
@ -373,13 +390,13 @@ a:hover {
 [class*="Popover-body-"],
 [class*="Tooltip-body-"] {
    background: var(--modal-bg-color) !important;
-    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;
+    background-repeat: repeat, no-repeat !important;
+    background-attachment: fixed, fixed !important;
+    background-position: center center, center center !important;
+    background-size: auto, cover !important;
+    -webkit-background-size: auto, cover !important;
+    -moz-background-size: auto, cover !important;
+    -o-background-size: auto, cover !important;
 }

 [class*="Tooltip-tooltipContainer-"] {
--- a/css/base/radarr/radarr-base.css
+++ b/css/base/radarr/radarr-base.css
@ -41,11 +41,11 @@ body {
 }

 /* LINKS */
-[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]) {
+[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]):not([class*="Button-"]) {
    color: var(--link-color);   
   }
   
-[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]):hover {
+[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]):hover:not([class*="Button-"]):hover {
 color: var(--link-color-hover);   
 }

@ -274,6 +274,15 @@ a:hover {
    border-left: 3px solid rgb(var(--accent-color));
 }

+#sidebar-toggle-button {
+    color: var(--text);
+}
+#sidebar-toggle-button:hover,
+#sidebar-toggle-button:focus,
+#sidebar-toggle-button:active {
+    color: var(--text-hover);
+}
+
 /* MOVIES PAGE */
 /* RADARR SPECIFIC */
 [class*="MovieIndexPoster-controls-"] {
@ -382,13 +391,13 @@ a:hover {
 [class*="Popover-body-"],
 [class*="Tooltip-body-"] {
    background: var(--modal-bg-color) !important;
-    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;
+    background-repeat: repeat, no-repeat !important;
+    background-attachment: fixed, fixed !important;
+    background-position: center center, center center !important;
+    background-size: auto, cover !important;
+    -webkit-background-size: auto, cover !important;
+    -moz-background-size: auto, cover !important;
+    -o-background-size: auto, cover !important;
 }

 [class*="Tooltip-tooltipContainer-"] {
@ -453,6 +462,26 @@ a:hover {
    color: var(--text-hover);
 }

+[class*="Label-success-"] {
+    border-color: #27c24c;
+    background-color: #27c24c;
+    color: var(--label-text-color);
+}
+
+[class*="Label-disabled-"][class*="Label-outline-"] {
+    color: #000;
+}
+
+[class*="Label-outline-"] {
+    background-color: #999;
+}
+
+[class*="Label-disabled-"] {
+    border-color: #999;
+    background-color: #999;
+    color: #000;
+}
+
 /* Table options*/
 [class*="TableOptionsColumn-column-"] {
    background: rgba(0, 0, 0, .25);
--- a/css/base/readarr/readarr-base.css
+++ b/css/base/readarr/readarr-base.css
@ -42,11 +42,11 @@ body {
 }

 /* LINKS */
-[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]) {
+[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]):not([class*="Button-"]) {
    color: var(--link-color);   
   }
   
-[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]):hover {
+[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]):hover:not([class*="Button-"]):hover {
 color: var(--link-color-hover);   
 }

@ -321,6 +321,15 @@ a:hover {
    border-left: 3px solid rgb(var(--accent-color));
 }

+#sidebar-toggle-button {
+    color: var(--text);
+}
+#sidebar-toggle-button:hover,
+#sidebar-toggle-button:focus,
+#sidebar-toggle-button:active {
+    color: var(--text-hover);
+}
+
 /* LIBRARY PAGE */
 /* LIDARR SPECIFIC */
 [class*="AuthorIndexPoster-controls-"] {
@ -439,13 +448,13 @@ a:hover {
 [class*="Popover-body-"],
 [class*="Tooltip-body-"] {
    background: var(--modal-bg-color) !important;
-    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;
+    background-repeat: repeat, no-repeat !important;
+    background-attachment: fixed, fixed !important;
+    background-position: center center, center center !important;
+    background-size: auto, cover !important;
+    -webkit-background-size: auto, cover !important;
+    -moz-background-size: auto, cover !important;
+    -o-background-size: auto, cover !important;
 }

 [class*="Tooltip-tooltipContainer-"] {
@ -505,6 +514,26 @@ a:hover {
    color: #fff;
 }

+[class*="Label-success-"] {
+    border-color: #27c24c;
+    background-color: #27c24c;
+    color: var(--label-text-color);
+}
+
+[class*="Label-disabled-"][class*="Label-outline-"] {
+    color: #000;
+}
+
+[class*="Label-outline-"] {
+    background-color: #999;
+}
+
+[class*="Label-disabled-"] {
+    border-color: #999;
+    background-color: #999;
+    color: #000;
+}
+
 /* Table options*/
 [class*="TableOptionsColumn-column-"] {
    background: rgba(0, 0, 0, .25);
--- a/css/base/sonarr/sonarr-base.css
+++ b/css/base/sonarr/sonarr-base.css
@ -43,11 +43,11 @@ body {
 }

 /* LINKS */
-[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]) {
+[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]):not([class*="Button-"]) {
    color: var(--link-color);   
   }
   
-[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]):hover {
+[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]):hover:not([class*="Button-"]):hover {
 color: var(--link-color-hover);   
 }

@ -287,6 +287,15 @@ a:hover {
    border-left: 3px solid rgb(var(--accent-color));
 }

+#sidebar-toggle-button {
+    color: var(--text);
+}
+#sidebar-toggle-button:hover,
+#sidebar-toggle-button:focus,
+#sidebar-toggle-button:active {
+    color: var(--text-hover);
+}
+
 /* SERIES PAGE */
 /* SONARR SPECIFIC  */
 [class*="SeriesIndexPoster-controls-"] {
@ -388,13 +397,13 @@ a:hover {
 [class*="Popover-body-"],
 [class*="Tooltip-bod-"] {
    background: var(--modal-bg-color) !important;
-    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;
+    background-repeat: repeat, no-repeat !important;
+    background-attachment: fixed, fixed !important;
+    background-position: center center, center center !important;
+    background-size: auto, cover !important;
+    -webkit-background-size: auto, cover !important;
+    -moz-background-size: auto, cover !important;
+    -o-background-size: auto, cover !important;
 }

 [class*="Tooltip-tooltipContainer-"] {
@ -479,6 +488,20 @@ a:hover {
    color: var(--label-text-color);
 }

+[class*="Label-disabled-"][class*="Label-outline-"] {
+    color: #000;
+}
+
+[class*="Label-outline-"] {
+    background-color: #999;
+}
+
+[class*="Label-disabled-"] {
+    border-color: #999;
+    background-color: #999;
+    color: #000;
+}
+
 /* Table options*/
 [class*="TableOptionsColumn-column-"] {
    background: rgba(0, 0, 0, .25);
--- a/css/base/unraid/unraid-base.css
+++ b/css/base/unraid/unraid-base.css
@ -457,13 +457,14 @@ li.caMenuItem:hover {
 .supportPopup,
 .popupProfile,
 .repoPopup,
-.ca_favouriteRepo {
+.ca_favouriteRepo,
+.donate {
    color: var(--button-text) !important;
    background: var(--button-color) !important;
    border-color: var(--button-color) !important;
 }

-#templates_content > div > div > div.ca_bottomLine > div.infoButton.ca_appPopup {
+.infoButton {
    color: var(--button-text) !important;
    background: var(--button-color) !important;
    border-color: var(--button-color) !important;
@ -551,6 +552,24 @@ li.caMenuItem:hover {
    color: #e22828 !important;
 }

+.card_readmore {
+    color: var(--link-color) !important;
+}
+
+.card_readmore:hover {
+    color: var(--link-color-hover) !important;
+}
+
+.actionsButton {
+    color: var(--button-text) !important;
+    background: var(--button-color) !important;
+}
+
+.actionsButton:hover {
+    color: var(--button-text-hover) !important;
+    background: var(--button-color-hover) !important;
+}
+
 /* CA search input */
 #searchButton:hover {
    color: rgb(var(--accent-color));
--- a/themes.py
+++ b/themes.py
@ -154,7 +154,9 @@ if __name__ == "__main__":
    themes = [name for name in listdir('./css/theme-options') if isfile(join('./css/theme-options', name))]
    community_themes = [name for name in listdir('./css/community-theme-options') if isfile(join('./css/community-theme-options', name))]
    with open("CNAME", "rt", closefd=True) as cname:
-        DOMAIN = cname.readline()
+        CNAME = cname.readline()
+    develop = True if subprocess.check_output(["git", "symbolic-ref", "--short", "HEAD"]).decode('ascii').strip() == "develop" else False
+    DOMAIN = CNAME if not develop else f"develop.{CNAME}"
    apps = loads(create_json(app_folders=app_folders, themes=themes, community_themes=community_themes))
    with open("themes.json", "w") as outfile:
        dump(apps, outfile, indent=2, sort_keys=True)