diff --git a/e2e/creatingASimpleGraph.spec.ts b/e2e/creatingASimpleGraph.spec.ts index c4be9b468..7a9bfdae1 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(); }); diff --git a/e2e/parameterTableAndKeyboardShortcuts.spec.ts b/e2e/parameterTableAndKeyboardShortcuts.spec.ts index 9a1783cde..976e9d2bd 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/src/EagleConfig.ts b/src/EagleConfig.ts index d37e037d3..9c5800bbf 100644 --- a/src/EagleConfig.ts +++ b/src/EagleConfig.ts @@ -105,9 +105,12 @@ const colors: { name: string; color: string; }[] = [ },{ name: 'graphWarning', color: '#ffa500' + },{ + + //eagle colors + name: 'hoverHighlight', + color: '#feb609' } - - ] export class EagleConfig { @@ -171,5 +174,6 @@ export class EagleConfig { $("#logicalGraphParent").get(0).style.setProperty("--matchingEdgeColor", EagleConfig.getColor('edgeAutoComplete')); $("#logicalGraphParent").get(0).style.setProperty("--nodeOutputColor", EagleConfig.getColor('nodeOutputPort')); $("#logicalGraphParent").get(0).style.setProperty("--nodeInputColor", EagleConfig.getColor('nodeInputPort')); + $("html").get(0).style.setProperty("--hoverHighlight", EagleConfig.getColor('hoverHighlight')); } } \ No newline at end of file diff --git a/static/assets/img/settings_white_24dp.svg b/static/assets/img/settings_white_24dp.svg deleted file mode 100644 index 1dbcba08a..000000000 --- a/static/assets/img/settings_white_24dp.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/static/base.css b/static/base.css index a1bc2c7cd..89cebd98b 100644 --- a/static/base.css +++ b/static/base.css @@ -1,5 +1,6 @@ html { - height:100% + height:100%; + --hoverHighlight:red; } body { @@ -71,6 +72,17 @@ body { margin:.3rem 0; } +.navbar #settings{ + width: 40px; + position: relative; +} + +.navbar #settings i{ + position: absolute; + font-size: 20px; + top: 10px; +} + #checkGraphWarnings span{ top: -3px; } @@ -437,12 +449,6 @@ color: #00bb00;} box-shadow: none; } -#inspector .headerButtons button:hover,.inspectorTitleBtns button:hover, #inspector i.clickable:hover { - color: #b4d4ff; - background-color: transparent; - cursor:pointer; -} - #inspector .headerButtons button.btn:focus, .inspectorTitleBtns button:focus { box-shadow: none; background-color:transparent; @@ -632,7 +638,7 @@ color: #00bb00;} height: 48px; top: 0px; left: -48px; - background-color: #002e5f; + background-color: #002e5f !important; z-index: 2; text-align: center; line-height: 48px; @@ -640,6 +646,7 @@ color: #00bb00;} border-top-left-radius: 0.5rem; cursor: pointer; color:white; + user-select: none; } .dropDropDownParent{ @@ -1321,13 +1328,13 @@ select.form-control{ #paletteList palette-component button, #paletteList palette-component span { height: 100%; width: 100%; + color:white; } #paletteList palette-component i { margin-left:50%; transform: translateX(-50%); pointer-events: none; - color:white; font-size: 24px; } @@ -1560,7 +1567,7 @@ select.form-control{ height: 48px; top: 0px; right: -48px; - background-color: #002e5f; + background-color: #002e5f !important; color:white; z-index: 2; text-align: center; @@ -1568,6 +1575,7 @@ select.form-control{ border-bottom-right-radius: 0.5rem; border-top-right-radius: 0.5rem; cursor: pointer; + user-select: none; } .leftWindow .leftWindowHandle span i { @@ -1635,16 +1643,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; @@ -2744,6 +2742,19 @@ palette-component input.form-control.selected { /* re-usable classes for various things */ +.iconHoverEffect, .iconHoverEffect:focus, .iconHoverEffect:active, .iconHoverEffect:hover{ + background: transparent; + border:0px; + box-shadow: none !important; +} + +.iconHoverEffect:hover { + color: var(--hoverHighlight) !important; + cursor: pointer; + 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; +} + .linearTransition250{ transition: ease-in-out 250ms !important; /*this requires an important tag to over ride existing transition effects for a few moments */ } \ No newline at end of file diff --git a/static/components/palette-component.html b/static/components/palette-component.html index 2844f901a..ae4c321f6 100644 --- a/static/components/palette-component.html +++ b/static/components/palette-component.html @@ -3,7 +3,7 @@
diff --git a/static/components/repository-file.html b/static/components/repository-file.html index f223126dc..724d5c97e 100644 --- a/static/components/repository-file.html +++ b/static/components/repository-file.html @@ -16,10 +16,10 @@
- add_box + add_box - delete + delete
diff --git a/static/components/repository.html b/static/components/repository.html index e3fe9587e..1b96fd837 100644 --- a/static/components/repository.html +++ b/static/components/repository.html @@ -6,8 +6,8 @@ - cloud_off - cloud_done + cloud_off + cloud_done @@ -26,7 +26,7 @@
- eject + eject
diff --git a/static/tables.css b/static/tables.css index 6898d38f6..c86492dc7 100644 --- a/static/tables.css +++ b/static/tables.css @@ -345,6 +345,18 @@ td:first-child input { padding:11px; } +.closeBottomWindowBtn { + position: absolute; + top: 27px; + transform:translateY(-50%) +} + +.closeBottomWindowBtn button, .closeBottomWindowBtn button:focus, .closeBottomWindowBtn button:active, .closeBottomWindowBtn button:hover{ + background: transparent; + border:0px; + box-shadow: none !important; +} + .eagleTableDisplay input, #editFieldModal .dropdown input{ border: none; } @@ -452,7 +464,7 @@ td:first-child input { overflow-y: auto; } -.eagleTableDisplay .typesInput{ +.eagleTableDisplay .typesInput{ padding: 0px; height: 35px; width: 100%; @@ -462,7 +474,7 @@ td:first-child input { border-right: solid 1px #bbbbbb; } -.eagleTableDisplay .input-group{ +.eagleTableDisplay .input-group{ border:black solid 1px; border-radius: 2px; flex-wrap: unset; @@ -471,6 +483,10 @@ td:first-child input { padding-left:2px; } +.eagleTableDisplay .input-group span{ + margin: -2px; +} + .eagleTableDisplay td button, #editFieldModal .dropdown-menu button{ border: none; background-color: transparent; @@ -482,11 +498,11 @@ td:first-child input { border-radius: 10px; } -.eagleTableDisplay td button:disabled{ +.eagleTableDisplay td button:disabled{ color: rgb(113 113 113); } -.eagleTableDisplay td button.parameterTableDescriptionBtn, .eagleTableDisplay td button.parameterTableCommentBtn { +.eagleTableDisplay td button.parameterTableDescriptionBtn, .eagleTableDisplay td button.parameterTableCommentBtn { position: absolute; right: 4px; top: 4px; @@ -497,7 +513,7 @@ td:first-child input { font-size: 12px; } -.eagleTableDisplay td button.parameterTableDescriptionBtn::before, .eagleTableDisplay td button.parameterTableCommentBtn::before { +.eagleTableDisplay td button.parameterTableDescriptionBtn::before, .eagleTableDisplay td button.parameterTableCommentBtn::before { top: 50%; left: 50%; transform: translate(-50%, -50%); diff --git a/templates/Errors.html b/templates/Errors.html index e606f671f..735da7235 100644 --- a/templates/Errors.html +++ b/templates/Errors.html @@ -5,10 +5,9 @@
Graph Issues
- -
diff --git a/templates/base.html b/templates/base.html index b11b6ef9c..4360311ad 100644 --- a/templates/base.html +++ b/templates/base.html @@ -57,7 +57,7 @@
-
+
arrow_back @@ -148,19 +148,19 @@
- - -
-
+
arrow_forward @@ -190,20 +190,23 @@
- - - -
+
+ +
diff --git a/templates/config_parameter_table.html b/templates/config_parameter_table.html index 6a300363a..a2a706355 100644 --- a/templates/config_parameter_table.html +++ b/templates/config_parameter_table.html @@ -6,11 +6,10 @@
-
@@ -58,19 +57,19 @@
- - - - diff --git a/templates/inspector.html b/templates/inspector.html index 9eb9115be..d379fe97d 100644 --- a/templates/inspector.html +++ b/templates/inspector.html @@ -13,45 +13,45 @@
- close + close
-
+
link fingerprint - library_books + library_books - error + error
@@ -104,7 +104,7 @@
Category:

Edge Attributes

- close + close
@@ -112,18 +112,18 @@

Edge Attributes

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

Multi Selection

- close + close
@@ -209,17 +209,17 @@

Multi Selection

@@ -249,7 +249,7 @@
Edges Selected:
- info + info @@ -263,7 +263,7 @@
Edges Selected:

Graph Info

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

Graph Info

account_tree link - sticky_note_2 - menu_book + sticky_note_2 + menu_book
- dns + dns
@@ -333,7 +333,7 @@
Config Fields:
- info + info
diff --git a/templates/modals/errors.html b/templates/modals/errors.html index bfc853c09..d61cd76e9 100644 --- a/templates/modals/errors.html +++ b/templates/modals/errors.html @@ -62,7 +62,7 @@

@@ -60,7 +60,7 @@
@@ -74,7 +74,7 @@
diff --git a/templates/navbar.html b/templates/navbar.html index 4ecb6fba9..a680585e3 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -21,23 +21,23 @@ @@ -68,12 +68,12 @@ - + + + diff --git a/templates/node_parameter_table.html b/templates/node_parameter_table.html index 5cd8d3f35..2de0dc57a 100644 --- a/templates/node_parameter_table.html +++ b/templates/node_parameter_table.html @@ -29,11 +29,10 @@
Fields Table:
Browse DockerHub -