From 6061b55f676674a97bd8da541bb7597417eb4661 Mon Sep 17 00:00:00 2001 From: MWicenec Date: Tue, 14 Jan 2025 12:46:35 +0800 Subject: [PATCH 01/16] working on a combined close bottom window button --- static/tables.css | 9 +++++++++ templates/base.html | 3 +++ 2 files changed, 12 insertions(+) diff --git a/static/tables.css b/static/tables.css index 6898d38f..7bd0239e 100644 --- a/static/tables.css +++ b/static/tables.css @@ -345,6 +345,15 @@ td:first-child input { padding:11px; } +.closeBottomWindowBtn { + position: absolute; + +} + +.closeBottomWindowBtn button{ + background: transparent; +} + .eagleTableDisplay input, #editFieldModal .dropdown input{ border: none; } diff --git a/templates/base.html b/templates/base.html index b11b6ef9..40716abd 100644 --- a/templates/base.html +++ b/templates/base.html @@ -204,6 +204,9 @@ +
+ +
From 889e30574715bf459638b73fb8745492efcd5d0c Mon Sep 17 00:00:00 2001 From: M-Wicenec Date: Tue, 14 Jan 2025 14:06:23 +0800 Subject: [PATCH 02/16] added a joined button to close the bottom window --- static/tables.css | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/static/tables.css b/static/tables.css index 7bd0239e..d56c194c 100644 --- a/static/tables.css +++ b/static/tables.css @@ -347,11 +347,18 @@ td:first-child input { .closeBottomWindowBtn { position: absolute; - + top: 27px; + transform:translateY(-50%) } -.closeBottomWindowBtn button{ +.closeBottomWindowBtn button, .closeBottomWindowBtn button:focus, .closeBottomWindowBtn button:active, .closeBottomWindowBtn button:hover{ background: transparent; + border:0px; + box-shadow: none !important; +} + +.closeBottomWindowBtn button:hover, #bottomWindow .tabs button:hover { + color: #feb609 !important; } .eagleTableDisplay input, #editFieldModal .dropdown input{ From 8a738a61c0ef1770dff970b196462369b1ed1e61 Mon Sep 17 00:00:00 2001 From: M-Wicenec Date: Tue, 14 Jan 2025 14:28:48 +0800 Subject: [PATCH 03/16] removed the individual close bottom window buttons --- e2e/parameterTableAndKeyboardShortcuts.spec.ts | 2 +- templates/Errors.html | 1 - templates/config_parameter_table.html | 1 - templates/graph_configurations_table.html | 1 - templates/node_parameter_table.html | 1 - 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/e2e/parameterTableAndKeyboardShortcuts.spec.ts b/e2e/parameterTableAndKeyboardShortcuts.spec.ts index 9a1783cd..976e9d2b 100644 --- a/e2e/parameterTableAndKeyboardShortcuts.spec.ts +++ b/e2e/parameterTableAndKeyboardShortcuts.spec.ts @@ -88,7 +88,7 @@ test('Parameter Tables and keyboard Shortcuts', async ({ page }) => { //close the parameter table modal await page.waitForTimeout(800); - await page.locator('.parameterTableCloseButton').click(); + await page.locator('.closeBottomWindowBtn button').click(); //open the key graph parameter table modal await page.locator('#openGraphConfigurationTable').click(); diff --git a/templates/Errors.html b/templates/Errors.html index e606f671..b9a8b14d 100644 --- a/templates/Errors.html +++ b/templates/Errors.html @@ -8,7 +8,6 @@
Graph Issues
-
diff --git a/templates/config_parameter_table.html b/templates/config_parameter_table.html index 6a300363..40961383 100644 --- a/templates/config_parameter_table.html +++ b/templates/config_parameter_table.html @@ -6,7 +6,6 @@
-
diff --git a/templates/node_parameter_table.html b/templates/node_parameter_table.html index 5cd8d3f3..3a3f46ea 100644 --- a/templates/node_parameter_table.html +++ b/templates/node_parameter_table.html @@ -29,7 +29,6 @@
Fields Table:
Browse DockerHub -
link fingerprint - library_books + library_books - error + error
@@ -112,18 +112,18 @@

Edge Attributes

- error + error
@@ -168,7 +168,7 @@
Dest Port:
Loop Aware
- @@ -179,7 +179,7 @@
Loop Aware
Closes Loop
- @@ -209,17 +209,17 @@

Multi Selection

@@ -278,11 +278,11 @@

Graph Info

account_tree link - sticky_note_2 - menu_book + sticky_note_2 + menu_book
- dns + dns
From f59ed4ec442a3f65991447e13d51a88754fbdf84 Mon Sep 17 00:00:00 2001 From: M-Wicenec Date: Tue, 14 Jan 2025 15:13:12 +0800 Subject: [PATCH 06/16] replaced the hover effect of navbar icons buttons with the universal one --- static/base.css | 10 ---------- templates/base.html | 6 +++--- templates/navbar.html | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/static/base.css b/static/base.css index 5e116229..607787f8 100644 --- a/static/base.css +++ b/static/base.css @@ -1640,16 +1640,6 @@ select.form-control{ background: rgb(211, 211, 211); } -.navbar-center .navbar-btn:hover{ - color: #002349 !important; - background: white; -} - -.nodeSettingsBtn{ - text-align: right; - color: #0059a5; -} - #repositoryList ul.repositories { list-style-type: none; padding: 0px; diff --git a/templates/base.html b/templates/base.html index 2d87cc94..e66395f0 100644 --- a/templates/base.html +++ b/templates/base.html @@ -148,14 +148,14 @@
- - - diff --git a/templates/navbar.html b/templates/navbar.html index f4ed4bc7..49bf0bd2 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -21,23 +21,23 @@ @@ -68,12 +68,12 @@ @@ -249,7 +249,7 @@
Edges Selected:
- info + info @@ -333,7 +333,7 @@
Config Fields:
- info + info
diff --git a/templates/node_parameter_table.html b/templates/node_parameter_table.html index 945d7385..2de0dc57 100644 --- a/templates/node_parameter_table.html +++ b/templates/node_parameter_table.html @@ -98,14 +98,14 @@
Fields Table:
@@ -160,12 +160,12 @@
Fields Table:
- - @@ -312,7 +312,7 @@
Fields Table:
- + @@ -329,7 +329,7 @@
Fields Table:
@@ -347,59 +347,59 @@
Fields Table:
@@ -443,18 +443,18 @@
Fields Table:
- + - - - + + + - + - + From 71c2a943344a31dfdaf81ca731fd49e8d78a8359 Mon Sep 17 00:00:00 2001 From: MWicenec Date: Wed, 15 Jan 2025 13:56:54 +0800 Subject: [PATCH 09/16] hover effects for buttons in the settings modal --- templates/modals/settings.html | 8 ++++---- templates/palettes.html | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/modals/settings.html b/templates/modals/settings.html index b7985395..e43e68c3 100644 --- a/templates/modals/settings.html +++ b/templates/modals/settings.html @@ -47,8 +47,8 @@
@@ -60,7 +60,7 @@
@@ -74,7 +74,7 @@
diff --git a/templates/palettes.html b/templates/palettes.html index 6a9510fa..c01ceac1 100644 --- a/templates/palettes.html +++ b/templates/palettes.html @@ -4,7 +4,7 @@ - - cloud_off - cloud_done + cloud_off + cloud_done @@ -26,7 +26,7 @@
- eject + eject
From 6e19750ed4e65de6a35b52c87011b7dda3b736ed Mon Sep 17 00:00:00 2001 From: M-Wicenec Date: Thu, 16 Jan 2025 14:36:55 +0800 Subject: [PATCH 15/16] testing and adding some effects for text hovering --- static/base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/base.css b/static/base.css index 125de126..89cebd98 100644 --- a/static/base.css +++ b/static/base.css @@ -2751,7 +2751,7 @@ palette-component input.form-control.selected { .iconHoverEffect:hover { color: var(--hoverHighlight) !important; cursor: pointer; - /* text-shadow: 1px 1px #4b4b4b !important; */ + border-color: var(--hoverHighlight) !important; text-shadow: -1px -1px 0 #4b4b4b, 0 -1px 0 #4b4b4b, 1px -1px 0 #4b4b4b, 1px 0 0 #4b4b4b, 1px 1px 0 #4b4b4b, 0 1px 0 #4b4b4b, -1px 1px 0 #4b4b4b, -1px 0 0 #4b4b4b; } From 3ebbda29488070c41f7b5bb87348b527d658a8ec Mon Sep 17 00:00:00 2001 From: MWicenec Date: Thu, 16 Jan 2025 15:14:51 +0800 Subject: [PATCH 16/16] fixed unit tests --- e2e/creatingASimpleGraph.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/creatingASimpleGraph.spec.ts b/e2e/creatingASimpleGraph.spec.ts index c4be9b46..7a9bfdae 100644 --- a/e2e/creatingASimpleGraph.spec.ts +++ b/e2e/creatingASimpleGraph.spec.ts @@ -59,7 +59,7 @@ test('Creating a Simple Graph', async ({ page }) => { //wait for bootstrap modal then close await page.waitForTimeout(500); - await page.locator('.parameterTable').getByRole('button', { name: 'Close' }).click(); + await page.locator('.closeBottomWindowBtn').getByRole('button').click(); await page.close(); });