diff --git a/browser_tests/actionbar.spec.ts b/browser_tests/actionbar.spec.ts index ae0c257c..5185ca04 100644 --- a/browser_tests/actionbar.spec.ts +++ b/browser_tests/actionbar.spec.ts @@ -8,7 +8,7 @@ const test = mergeTests(comfyPageFixture, webSocketFixture) test.describe('Actionbar', () => { test.beforeEach(async ({ comfyPage }) => { - await comfyPage.setSetting('Comfy.UseNewMenu', 'Floating') + await comfyPage.setSetting('Comfy.UseNewMenu', 'Top') }) test.afterEach(async ({ comfyPage }) => { diff --git a/browser_tests/browserTabTitle.spec.ts b/browser_tests/browserTabTitle.spec.ts index 45dc0420..abbe90df 100644 --- a/browser_tests/browserTabTitle.spec.ts +++ b/browser_tests/browserTabTitle.spec.ts @@ -4,7 +4,7 @@ import { comfyPageFixture as test } from './ComfyPage' test.describe('Browser tab title', () => { test.describe('Beta Menu', () => { test.beforeEach(async ({ comfyPage }) => { - await comfyPage.setSetting('Comfy.UseNewMenu', 'Floating') + await comfyPage.setSetting('Comfy.UseNewMenu', 'Top') }) test.afterEach(async ({ comfyPage }) => { diff --git a/browser_tests/extensionAPI.spec.ts b/browser_tests/extensionAPI.spec.ts index 7bbbbac3..9902d668 100644 --- a/browser_tests/extensionAPI.spec.ts +++ b/browser_tests/extensionAPI.spec.ts @@ -3,7 +3,7 @@ import { comfyPageFixture as test } from './ComfyPage' test.describe('Topbar commands', () => { test.beforeEach(async ({ comfyPage }) => { - await comfyPage.setSetting('Comfy.UseNewMenu', 'Floating') + await comfyPage.setSetting('Comfy.UseNewMenu', 'Top') }) test.afterEach(async ({ comfyPage }) => { diff --git a/browser_tests/groupNode.spec.ts b/browser_tests/groupNode.spec.ts index 0c86272e..e24255ce 100644 --- a/browser_tests/groupNode.spec.ts +++ b/browser_tests/groupNode.spec.ts @@ -13,7 +13,7 @@ test.describe('Group Node', () => { let libraryTab test.beforeEach(async ({ comfyPage }) => { - await comfyPage.setSetting('Comfy.UseNewMenu', 'Floating') + await comfyPage.setSetting('Comfy.UseNewMenu', 'Top') libraryTab = comfyPage.menu.nodeLibraryTab await comfyPage.convertAllNodesToGroupNode(groupNodeName) await libraryTab.open() @@ -182,7 +182,7 @@ test.describe('Group Node', () => { } test.beforeEach(async ({ comfyPage }) => { - await comfyPage.setSetting('Comfy.UseNewMenu', 'Floating') + await comfyPage.setSetting('Comfy.UseNewMenu', 'Top') await comfyPage.loadWorkflow(WORKFLOW_NAME) await comfyPage.menu.nodeLibraryTab.open() diff --git a/browser_tests/interaction.spec.ts b/browser_tests/interaction.spec.ts index 2cd25a51..743884e0 100644 --- a/browser_tests/interaction.spec.ts +++ b/browser_tests/interaction.spec.ts @@ -480,7 +480,7 @@ test.describe('Load workflow', () => { test.describe('Load duplicate workflow', () => { test.beforeEach(async ({ comfyPage }) => { - await comfyPage.setSetting('Comfy.UseNewMenu', 'Floating') + await comfyPage.setSetting('Comfy.UseNewMenu', 'Top') }) test.afterEach(async ({ comfyPage }) => { diff --git a/browser_tests/menu.spec.ts b/browser_tests/menu.spec.ts index 840c9751..801ac3d6 100644 --- a/browser_tests/menu.spec.ts +++ b/browser_tests/menu.spec.ts @@ -3,7 +3,7 @@ import { comfyPageFixture as test } from './ComfyPage' test.describe('Menu', () => { test.beforeEach(async ({ comfyPage }) => { - await comfyPage.setSetting('Comfy.UseNewMenu', 'Floating') + await comfyPage.setSetting('Comfy.UseNewMenu', 'Top') }) test.afterEach(async ({ comfyPage }) => { @@ -508,7 +508,7 @@ test.describe('Menu', () => { comfyPage }) => { await comfyPage.setSetting('Comfy.UseNewMenu', position) - expect(await comfyPage.getSetting('Comfy.UseNewMenu')).toBe('Floating') + expect(await comfyPage.getSetting('Comfy.UseNewMenu')).toBe('Top') }) test(`Can migrate deprecated menu positions on initial load (${position})`, async ({ @@ -516,7 +516,7 @@ test.describe('Menu', () => { }) => { await comfyPage.setSetting('Comfy.UseNewMenu', position) await comfyPage.setup() - expect(await comfyPage.getSetting('Comfy.UseNewMenu')).toBe('Floating') + expect(await comfyPage.getSetting('Comfy.UseNewMenu')).toBe('Top') }) }) diff --git a/browser_tests/propertiesPanel.spec.ts b/browser_tests/propertiesPanel.spec.ts index b9c96b71..8e997bdd 100644 --- a/browser_tests/propertiesPanel.spec.ts +++ b/browser_tests/propertiesPanel.spec.ts @@ -3,7 +3,7 @@ import { comfyPageFixture as test } from './ComfyPage' test.describe('Properties Panel', () => { test.beforeEach(async ({ comfyPage }) => { - await comfyPage.setSetting('Comfy.UseNewMenu', 'Floating') + await comfyPage.setSetting('Comfy.UseNewMenu', 'Top') }) test.afterEach(async ({ comfyPage }) => { diff --git a/browser_tests/templates.spec.ts b/browser_tests/templates.spec.ts index 16c603e6..75968bdf 100644 --- a/browser_tests/templates.spec.ts +++ b/browser_tests/templates.spec.ts @@ -3,7 +3,7 @@ import { comfyPageFixture as test } from './ComfyPage' test.describe('Templates', () => { test.beforeEach(async ({ comfyPage }) => { - await comfyPage.setSetting('Comfy.UseNewMenu', 'Floating') + await comfyPage.setSetting('Comfy.UseNewMenu', 'Top') }) test.afterEach(async ({ comfyPage }) => { diff --git a/src/assets/css/style.css b/src/assets/css/style.css index de0a12ac..1e9596df 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -126,7 +126,8 @@ body { /* Span across all columns */ grid-column: 1/-1; grid-row: 3; - z-index: 10; + /* Bottom menu bar dropdown needs to be above of graph canvas splitter overlay which is z-index: 999 */ + z-index: 1000; display: flex; flex-direction: column; } diff --git a/src/components/topbar/TopMenubar.vue b/src/components/topbar/TopMenubar.vue index 12bb63cb..b6680c02 100644 --- a/src/components/topbar/TopMenubar.vue +++ b/src/components/topbar/TopMenubar.vue @@ -1,5 +1,5 @@