From c5498223826ec929b7631efdaebf17e08666573b Mon Sep 17 00:00:00 2001 From: DavidBabinec Date: Mon, 13 Jul 2026 10:58:50 +0200 Subject: [PATCH] fix(admin): keep responsive navigation left-aligned --- src/admin/pages/site/toolbar/Toolbar.module.css | 8 -------- tests/e2e/admin-navigation.e2e.ts | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/admin/pages/site/toolbar/Toolbar.module.css b/src/admin/pages/site/toolbar/Toolbar.module.css index 982e81655..19d096bf2 100644 --- a/src/admin/pages/site/toolbar/Toolbar.module.css +++ b/src/admin/pages/site/toolbar/Toolbar.module.css @@ -286,13 +286,6 @@ padding: var(--space-4xs) var(--space-s); } - .siteName, - .siteNameSkeleton, - .siteFavicon, - .workspaceToolbarItems { - order: 1; - } - .siteName { max-width: 104px; margin-right: var(--space-4xs); @@ -320,7 +313,6 @@ .adminLink, .activeSection { - order: 2; justify-content: center; width: 30px; min-width: 30px; diff --git a/tests/e2e/admin-navigation.e2e.ts b/tests/e2e/admin-navigation.e2e.ts index ac67a2de0..9b7f9ab4b 100644 --- a/tests/e2e/admin-navigation.e2e.ts +++ b/tests/e2e/admin-navigation.e2e.ts @@ -113,6 +113,7 @@ test.describe('admin navigation', () => { page.getByTestId('account-menu-trigger'), 'mobile toolbar account menu trigger', ) + await expectNavigationBeforeToolbarTrailer(page) }) }) @@ -508,6 +509,20 @@ async function expectLocatorContained( expect(box.x + box.width).toBeLessThanOrEqual(viewportWidth + 1) } +async function expectNavigationBeforeToolbarTrailer(page: Page): Promise { + const toolbar = page.getByTestId('toolbar') + const navigationBox = await toolbar.getByRole('link', { name: 'Site' }).boundingBox() + const settingsBox = await toolbar.getByTestId('toolbar-settings-btn').boundingBox() + if (!navigationBox || !settingsBox) { + throw new Error('mobile toolbar navigation or settings button had no bounding box') + } + + const navigationPrecedesSettings = + navigationBox.y < settingsBox.y || + (Math.abs(navigationBox.y - settingsBox.y) <= 1 && navigationBox.x < settingsBox.x) + expect(navigationPrecedesSettings).toBe(true) +} + async function expectStoredWorkspaceLayout( page: Page, expected: {