diff --git a/cypress/e2e/18-user-management.cy.ts b/cypress/e2e/18-user-management.cy.ts index 91ab059f8..0dc126473 100644 --- a/cypress/e2e/18-user-management.cy.ts +++ b/cypress/e2e/18-user-management.cy.ts @@ -132,7 +132,7 @@ describe('User Management', { disableAutoLogin: true }, () => { .logo() .should('have.attr', 'src') .then((src) => { - expect(src).to.include('/n8n-dev-logo-dark-mode.svg'); + expect(src).to.include('/static/logo/channel/dev-dark.svg'); }); cy.visit(personalSettingsPage.url); @@ -143,7 +143,7 @@ describe('User Management', { disableAutoLogin: true }, () => { .logo() .should('have.attr', 'src') .then((src) => { - expect(src).to.include('/n8n-dev-logo.svg'); + expect(src).to.include('/static/logo/channel/dev.svg'); }); }); diff --git a/packages/editor-ui/public/favicon-16x16.png b/packages/editor-ui/public/favicon-16x16.png deleted file mode 100644 index a6e6de975..000000000 Binary files a/packages/editor-ui/public/favicon-16x16.png and /dev/null differ diff --git a/packages/editor-ui/public/favicon-32x32.png b/packages/editor-ui/public/favicon-32x32.png deleted file mode 100644 index 4e5162cdf..000000000 Binary files a/packages/editor-ui/public/favicon-32x32.png and /dev/null differ diff --git a/packages/editor-ui/public/google-signin-light.png b/packages/editor-ui/public/google-signin-light.png deleted file mode 100644 index c1e2c5c7d..000000000 Binary files a/packages/editor-ui/public/google-signin-light.png and /dev/null differ diff --git a/packages/editor-ui/public/n8n-icon-small.png b/packages/editor-ui/public/n8n-icon-small.png deleted file mode 100644 index e709f773d..000000000 Binary files a/packages/editor-ui/public/n8n-icon-small.png and /dev/null differ diff --git a/packages/editor-ui/public/n8n-logo.svg b/packages/editor-ui/public/n8n-logo.svg deleted file mode 100644 index 068a73869..000000000 --- a/packages/editor-ui/public/n8n-logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/editor-ui/public/n8n-beta-logo-dark-mode.svg b/packages/editor-ui/public/static/logo/channel/beta-dark.svg similarity index 100% rename from packages/editor-ui/public/n8n-beta-logo-dark-mode.svg rename to packages/editor-ui/public/static/logo/channel/beta-dark.svg diff --git a/packages/editor-ui/public/n8n-beta-logo.svg b/packages/editor-ui/public/static/logo/channel/beta.svg similarity index 100% rename from packages/editor-ui/public/n8n-beta-logo.svg rename to packages/editor-ui/public/static/logo/channel/beta.svg diff --git a/packages/editor-ui/public/n8n-dev-logo-dark-mode.svg b/packages/editor-ui/public/static/logo/channel/dev-dark.svg similarity index 100% rename from packages/editor-ui/public/n8n-dev-logo-dark-mode.svg rename to packages/editor-ui/public/static/logo/channel/dev-dark.svg diff --git a/packages/editor-ui/public/n8n-dev-logo.svg b/packages/editor-ui/public/static/logo/channel/dev.svg similarity index 100% rename from packages/editor-ui/public/n8n-dev-logo.svg rename to packages/editor-ui/public/static/logo/channel/dev.svg diff --git a/packages/editor-ui/public/n8n-nightly-logo-dark-mode.svg b/packages/editor-ui/public/static/logo/channel/nightly-dark.svg similarity index 100% rename from packages/editor-ui/public/n8n-nightly-logo-dark-mode.svg rename to packages/editor-ui/public/static/logo/channel/nightly-dark.svg diff --git a/packages/editor-ui/public/n8n-nightly-logo.svg b/packages/editor-ui/public/static/logo/channel/nightly.svg similarity index 100% rename from packages/editor-ui/public/n8n-nightly-logo.svg rename to packages/editor-ui/public/static/logo/channel/nightly.svg diff --git a/packages/editor-ui/public/n8n-logo-collapsed.svg b/packages/editor-ui/public/static/logo/collapsed.svg similarity index 100% rename from packages/editor-ui/public/n8n-logo-collapsed.svg rename to packages/editor-ui/public/static/logo/collapsed.svg diff --git a/packages/editor-ui/public/n8n-logo-expanded-dark-mode.svg b/packages/editor-ui/public/static/logo/expanded-dark.svg similarity index 100% rename from packages/editor-ui/public/n8n-logo-expanded-dark-mode.svg rename to packages/editor-ui/public/static/logo/expanded-dark.svg diff --git a/packages/editor-ui/public/n8n-logo-expanded.svg b/packages/editor-ui/public/static/logo/expanded.svg similarity index 100% rename from packages/editor-ui/public/n8n-logo-expanded.svg rename to packages/editor-ui/public/static/logo/expanded.svg diff --git a/packages/editor-ui/src/components/MainSidebar.vue b/packages/editor-ui/src/components/MainSidebar.vue index 583c6aabf..3d146d0f5 100644 --- a/packages/editor-ui/src/components/MainSidebar.vue +++ b/packages/editor-ui/src/components/MainSidebar.vue @@ -166,9 +166,7 @@ export default defineComponent({ useTemplatesStore, ), logoPath(): string { - if (this.isCollapsed) return this.basePath + 'n8n-logo-collapsed.svg'; - - return this.basePath + this.uiStore.logo; + return this.basePath + (this.isCollapsed ? 'static/logo/collapsed.svg' : this.uiStore.logo); }, hasVersionUpdates(): boolean { return ( diff --git a/packages/editor-ui/src/stores/ui.store.ts b/packages/editor-ui/src/stores/ui.store.ts index fac480662..ff2444ef7 100644 --- a/packages/editor-ui/src/stores/ui.store.ts +++ b/packages/editor-ui/src/stores/ui.store.ts @@ -192,11 +192,10 @@ export const useUIStore = defineStore(STORES.UI, { }, logo(): string { const { releaseChannel } = useSettingsStore().settings; - const type = this.appliedTheme === 'dark' ? '-dark-mode.svg' : '.svg'; - - return releaseChannel === 'stable' - ? `n8n-logo-expanded${type}` - : `n8n-${releaseChannel}-logo${type}`; + const suffix = this.appliedTheme === 'dark' ? '-dark.svg' : '.svg'; + return `static/logo/${ + releaseChannel === 'stable' ? 'expanded' : `channel/${releaseChannel}` + }${suffix}`; }, contextBasedTranslationKeys() { const settingsStore = useSettingsStore();