Skip to content

W
web-ui
Commit 8b14a747 by Owen Ryan Ang
Options

Merge branch 'feature-WG-337-b2' into 'feature-WG-399b'

# Conflicts: # WebGde/WebContent/script.js
parents fa8b52ea bde29a18
Showing with 5 additions and 6 deletions
WebGde/WebContent/script.js
...@@ -46,10 +46,8 @@ async function initializeWebGDE() { ...@@ -46,10 +46,8 @@ async function initializeWebGDE() {
// UNCOMMENTED BY ADAM 9/25/2023 // UNCOMMENTED BY ADAM 9/25/2023
if (SHOW_ELEMENT_LIST_VIEWER === "Y") { if (SHOW_ELEMENT_LIST_VIEWER === "Y") {
/* await createWebGdeInterface(null);*/
setDocumentControlObject(new DocumentControlWidget()); setDocumentControlObject(new DocumentControlWidget());
/* document.getElementById("input-field-container").appendChild(DOCUMENT_CONTROL_OBJECT.getWidget());*/
var mainLogInScreenContainer = document.getElementById("logInMainContainer"); var mainLogInScreenContainer = document.getElementById("logInMainContainer");
mainLogInScreenContainer.remove(); mainLogInScreenContainer.remove();
removeLoadingScreen(); removeLoadingScreen();
...@@ -144,7 +142,6 @@ export function removeLoadingScreen() { ...@@ -144,7 +142,6 @@ export function removeLoadingScreen() {
} }
export async function resetGDE() { export async function resetGDE() {
// TO-DO // TO-DO
} }
......
WebGde/WebContent/style.css
...@@ -290,7 +290,8 @@ input[type=radio] { ...@@ -290,7 +290,8 @@ input[type=radio] {
} }
.image-capture, .image-capture,
.fingerprint-capture { .fingerprint-capture,
.file-upload {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 100%; width: 100%;
...@@ -714,7 +715,8 @@ span#filename { ...@@ -714,7 +715,8 @@ span#filename {
} }
.image-capture, .image-capture,
.fingerprint-capture { .fingerprint-capture,
.file-upload {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 100%; width: 100%;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment