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 @@