From a73b5acfbb31003855eddf3460fe442d5723093d Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 10 Mar 2022 16:26:38 +0100
Subject: [PATCH] Stop abusing lists for dialogs

Use some more sane elements for these things.
---
 app/styles/base.css | 10 ----------
 vnc.html            | 48 +++++++++++++++++++++------------------------
 2 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/app/styles/base.css b/app/styles/base.css
index 052398a7..68729222 100644
--- a/app/styles/base.css
+++ b/app/styles/base.css
@@ -854,11 +854,6 @@ select:active {
 #noVNC_verify_server_dlg.noVNC_open {
   transform: translateY(0);
 }
-#noVNC_verify_server_dlg ul {
-  list-style: none;
-  margin: 0px;
-  padding: 0px;
-}
 
 /* ----------------------------------------
  * Password Dialog
@@ -873,11 +868,6 @@ select:active {
 #noVNC_credentials_dlg.noVNC_open {
   transform: translateY(0);
 }
-#noVNC_credentials_dlg ul {
-  list-style: none;
-  margin: 0px;
-  padding: 0px;
-}
 .noVNC_hidden {
   display: none;
 }
diff --git a/vnc.html b/vnc.html
index 7656d277..15742e66 100644
--- a/vnc.html
+++ b/vnc.html
@@ -277,38 +277,34 @@
     <!-- Server Key Verification Dialog -->
     <div class="noVNC_center noVNC_connect_layer">
     <div id="noVNC_verify_server_dlg" class="noVNC_panel"><form>
-        <ul>
-            <li id="noVNC_fingerprint_block">
-                <label>Fingerprint:</label>
-                <div id="noVNC_fingerprint"></div>
-            </li>
-            <li>
-                Please verify the identification of the server by its fingerprint before you approve it.
-            </li>
-            <li>
-                <input id="noVNC_approve_server_button" type="submit" value="Approve" class="noVNC_submit">
-                <input id="noVNC_reject_server_button" type="button" value="Reject" class="noVNC_submit">
-            </li>
-        </ul>
+        <div id="noVNC_fingerprint_block">
+            <label>Fingerprint:</label>
+            <div id="noVNC_fingerprint"></div>
+        </div>
+        <div>
+            Please verify the identification of the server by its fingerprint before you approve it.
+        </div>
+        <div>
+            <input id="noVNC_approve_server_button" type="submit" value="Approve" class="noVNC_submit">
+            <input id="noVNC_reject_server_button" type="button" value="Reject" class="noVNC_submit">
+        </div>
     </form></div>
     </div>
 
     <!-- Password Dialog -->
     <div class="noVNC_center noVNC_connect_layer">
     <div id="noVNC_credentials_dlg" class="noVNC_panel"><form>
-        <ul>
-            <li id="noVNC_username_block">
-                <label>Username:</label>
-                <input id="noVNC_username_input">
-            </li>
-            <li id="noVNC_password_block">
-                <label>Password:</label>
-                <input id="noVNC_password_input" type="password">
-            </li>
-            <li>
-                <input id="noVNC_credentials_button" type="submit" value="Send Credentials" class="noVNC_submit">
-            </li>
-        </ul>
+        <div id="noVNC_username_block">
+            <label>Username:</label>
+            <input id="noVNC_username_input">
+        </div>
+        <div id="noVNC_password_block">
+            <label>Password:</label>
+            <input id="noVNC_password_input" type="password">
+        </div>
+        <div>
+            <input id="noVNC_credentials_button" type="submit" value="Send Credentials" class="noVNC_submit">
+        </div>
     </form></div>
     </div>