Merge branch 'master' into develop

themepark-dev · May 1, 2022 · 7cfc674 · 7cfc674
2 parents d0a3938 + 9be5dc3
commit 7cfc674
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/css/base/guacamole/guacamole-base.css b/css/base/guacamole/guacamole-base.css
@@ -50,6 +50,7 @@ div.displayMiddle {
     -o-background-size: auto, cover;
 }
 
+
 /* LOGIN MENU */
 div.login-ui {
     background: inherit;
@@ -101,15 +102,18 @@ select:focus {
     color: black;
 }
 
+.login-ui .login-dialog .login-fields input {
+    background: white;
+    color: black !important;
+}
 
 div.location,
 input[type=text],
 input[type=email],
 input[type=number],
 input[type=password],
 textarea {
-    color: var(--text-hover) !important;
-    background: var(--transparency-dark-25);
+    color: var(--text-hover);
 }
 
 input[type=checkbox],
@@ -323,6 +327,7 @@ table.sorted td {
     color: var(--text-hover);
 }
 
+
 .filter .search-string {
     background-image: url(/resources/guacamole/magnifier.png) !important;
     background-repeat: no-repeat !important;

diff --git a/docker-mods/deluge/root/etc/cont-init.d/98-themepark b/docker-mods/deluge/root/etc/cont-init.d/98-themepark
@@ -39,7 +39,7 @@ if [[ -z ${TP_THEME} ]]; then
 fi
 
 # Adding stylesheets
-DELUGE_INDEX_PATH=$(find -name index.html)
+DELUGE_INDEX_PATH=$(find /usr -name index.html)
 if ! grep -q "${TP_DOMAIN}/css/base" ${DELUGE_INDEX_PATH}; then
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'