Merge pull request #347 from GilbN/develop

Docker sed fixes

.github/workflows/minify-and-deploy.yml

@@ -7,6 +7,7 @@ on:
     paths-ignore:
         - 'docker-mods/**'
         - '.vscode/**'
+        - '.github/**'
 jobs:
   deploy:
     runs-on: ubuntu-latest

css/base/bitwarden/bitwarden-base.css

@@ -49,7 +49,7 @@ app-org-vault-groupings .card li.active>div a:first-of-type,
 .groupings .card li.active>a:first-of-type,
 .groupings .card li.active>div a:first-of-type,
 html[class*="theme_"] a {
-    color: var(--link-color-hover);
+    color: var(--link-color);
 }
 
 html[class*="theme_"] app-vault-groupings .card li.active>a:first-of-type,
@@ -69,7 +69,8 @@ html[class*="theme_"] .table td>a:not(.badge) {
     color: var(--link-color);
 }
 
-html[class*="theme_"] .table td>a:not(.badge):hover {
+html[class*="theme_"] .table td>a:not(.badge):hover,
+html[class*="theme_"] .card-header a:hover:not(.badge) {
     color: var(--link-color-hover);
 }
 
@@ -531,7 +532,7 @@ html[class*="theme_"] .nav-tabs .nav-link.active {
     border-color: rgba(255, 255, 255, 0.15);
 }
 
-.org-nav {
+html[class*="theme_"] .org-nav {
     background: var(--main-bg-color);
     background-repeat: repeat, no-repeat;
     background-attachment: fixed, fixed;
@@ -542,7 +543,9 @@ html[class*="theme_"] .nav-tabs .nav-link.active {
     -o-background-size: auto, cover;
 }
 
-.org-nav .nav-tabs a {
+html[class*="theme_"] .org-nav .nav-tabs a,
+html[class*="theme_"] .org-nav .org-name span,
+html[class*="theme_"] .org-nav .nav-tabs a:not(.active) {
     color: var(--text);
 }
 
@@ -570,6 +573,12 @@ app-org-vault-groupings .card li.active>div a:first-of-type {
     color: rgb(var(--accent-color));
 }
 
+/* Font Awesome */
+
+html[class*="theme_"] .table td [class*="fa-"] {
+    color: rgb(var(--accent-color));
+}
+
 /* PLACEHOLDER TEXT */
 input::-webkit-input-placeholder {
     color: var(--text);

css/base/unraid/unraid-base.css

@@ -373,6 +373,12 @@ div.tab [type=radio]+label {
 }
 
 /* CA */
+hr {
+
+color: var(--text);
+background-color: var(--text);
+}
+
 .ca_holderDocker {
     background-color: rgb(0 0 0 / 10%) !important;
     border-color: rgb(0 0 0 / 25%) !important;
@@ -457,18 +463,19 @@ li.caMenuItem:hover {
 }
 
 .supportButton,
-.actionsPopup,
+#sidenavContent .actionsPopup,
-.supportPopup,
+#sidenavContent .pinPopup,
-.popupProfile,
+#sidenavContent .supportPopup,
-.repoPopup,
+#sidenavContent .popupProfile,
-.ca_favouriteRepo,
+#sidenavContent .repoPopup,
-.donate {
+#sidenavContent .ca_favouriteRepo,
+#sidenavContent .donate {
     color: var(--button-text) !important;
     background: var(--button-color) !important;
     border-color: var(--button-color) !important;
 }
 
-.infoButton {
+.ca_holder .infoButton {
     color: var(--button-text) !important;
     background: var(--button-color) !important;
     border-color: var(--button-color) !important;
@@ -479,13 +486,14 @@ li.caMenuItem:hover {
     border-color: var(--button-color-hover) !important;
 }
 
-.supportButton:hover,
+#sidenavContent .supportButton:hover,
-.actionsPopup:hover,
+#sidenavContent .actionsPopup:hover,
-.supportPopup:hover,
+#sidenavContent .pinPopup:hover,
-.popupProfile:hover,
+#sidenavContent .supportPopup:hover,
-.repoPopup:hover,
+#sidenavContent .popupProfile:hover,
-.ca_favouriteRepo:hover,
+#sidenavContent .repoPopup:hover,
-.donate:hover{
+#sidenavContent .ca_favouriteRepo:hover,
+#sidenavContent .donate:hover{
     background: var(--button-color-hover) !important;
     color: var(--button-text-hover) !important;
     border-color: var(--button-color-hover) !important;
@@ -564,7 +572,7 @@ li.caMenuItem:hover {
     color: var(--link-color-hover) !important;
 }
 
-.actionsButton {
+.ca_holder .actionsButton {
     color: var(--button-text) !important;
     background: var(--button-color) !important;
 }

docker/root/defaults/default

@@ -9,10 +9,10 @@ server {
 
     location / {
         sub_filter_types *;
-        sub_filter 'https://theme-park.dev' $scheme://TP_DOMAIN;
+        sub_filter 'https://theme-park.dev' https://TP_DOMAIN;
-        sub_filter 'http://theme-park.dev' $scheme://TP_DOMAIN;
+        sub_filter 'http://theme-park.dev' http://TP_DOMAIN;
-        sub_filter 'https://develop.theme-park.dev' $scheme://TP_DOMAIN;
+        sub_filter 'https://develop.theme-park.dev' https://TP_DOMAIN;
-        sub_filter 'http://develop.theme-park.dev' $scheme://TP_DOMAIN;
+        sub_filter 'http://develop.theme-park.dev' http://TP_DOMAIN;
         sub_filter_once off;
         try_files $uri $uri/ /index.html;
     }

docker/root/etc/cont-init.d/50-config

@@ -17,7 +17,16 @@ if [[ -z ${TP_DOMAIN} ]]; then
     TP_DOMAIN='$http_host'
 fi
 
-sed -i "s/TP_DOMAIN;/${TP_DOMAIN}; /g" /defaults/default
+if [[ -z ${TP_SCHEME} ]]; then
+    echo 'No scheme set, defaulting to https'
+    TP_SCHEME='https'
+fi
+
+DEFAULT='/defaults/default'
+sed -i "s/sub_filter 'https:\/\/theme-park.dev' https:\/\/TP_DOMAIN;/sub_filter 'https:\/\/theme-park.dev' ${TP_SCHEME}:\/\/${TP_DOMAIN}; /g" ${DEFAULT}
+sed -i "s/sub_filter 'http:\/\/theme-park.dev' http:\/\/TP_DOMAIN;/sub_filter 'http:\/\/theme-park.dev' ${TP_SCHEME}:\/\/${TP_DOMAIN}; /g" ${DEFAULT}
+sed -i "s/sub_filter 'https:\/\/develop.theme-park.dev' https:\/\/TP_DOMAIN;/sub_filter 'https:\/\/develop.theme-park.dev' ${TP_SCHEME}:\/\/${TP_DOMAIN}; /g" ${DEFAULT}
+sed -i "s/sub_filter 'http:\/\/develop.theme-park.dev' http:\/\/TP_DOMAIN;/sub_filter 'http:\/\/develop.theme-park.dev' ${TP_SCHEME}:\/\/${TP_DOMAIN}; /g" ${DEFAULT}
 cp /defaults/default /config/nginx/site-confs
 
 # make our folders and links