Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
web-ui
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
WEBGDE-Components
web-ui
Commits
8b14a747
Commit
8b14a747
authored
Oct 10, 2023
by
Owen Ryan Ang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-WG-337-b2' into 'feature-WG-399b'
# Conflicts: # WebGde/WebContent/script.js
parents
fa8b52ea
bde29a18
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
script.js
WebGde/WebContent/script.js
+1
-4
style.css
WebGde/WebContent/style.css
+4
-2
No files found.
WebGde/WebContent/script.js
View file @
8b14a747
...
...
@@ -46,10 +46,8 @@ async function initializeWebGDE() {
// UNCOMMENTED BY ADAM 9/25/2023
if
(
SHOW_ELEMENT_LIST_VIEWER
===
"Y"
)
{
/* await createWebGdeInterface(null);*/
setDocumentControlObject
(
new
DocumentControlWidget
());
/* document.getElementById("input-field-container").appendChild(DOCUMENT_CONTROL_OBJECT.getWidget());*/
var
mainLogInScreenContainer
=
document
.
getElementById
(
"logInMainContainer"
);
mainLogInScreenContainer
.
remove
();
removeLoadingScreen
();
...
...
@@ -144,7 +142,6 @@ export function removeLoadingScreen() {
}
export
async
function
resetGDE
()
{
// TO-DO
}
...
...
WebGde/WebContent/style.css
View file @
8b14a747
...
...
@@ -290,7 +290,8 @@ input[type=radio] {
}
.image-capture
,
.fingerprint-capture
{
.fingerprint-capture
,
.file-upload
{
display
:
flex
;
flex-direction
:
column
;
width
:
100%
;
...
...
@@ -714,7 +715,8 @@ span#filename {
}
.image-capture
,
.fingerprint-capture
{
.fingerprint-capture
,
.file-upload
{
display
:
flex
;
flex-direction
:
column
;
width
:
100%
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment