diff --git a/packages/design-system/src/components/N8nNotice/Notice.vue b/packages/design-system/src/components/N8nNotice/Notice.vue index 6f0681dbb..740e0d0ef 100644 --- a/packages/design-system/src/components/N8nNotice/Notice.vue +++ b/packages/design-system/src/components/N8nNotice/Notice.vue @@ -105,7 +105,7 @@ export default Vue.extend({ font-size: var(--font-size-2xs); display: flex; color: var(--custom-font-black); - margin: var(--spacing-s) 0; + margin: var(--notice-margin, var(--spacing-s) 0); padding: var(--spacing-2xs); background-color: var(--background-color); border-width: 1px 1px 1px 7px; diff --git a/packages/design-system/src/components/N8nNotice/__tests__/__snapshots__/Notice.spec.ts.snap b/packages/design-system/src/components/N8nNotice/__tests__/__snapshots__/Notice.spec.ts.snap index d39ad415d..ea1dcc047 100644 --- a/packages/design-system/src/components/N8nNotice/__tests__/__snapshots__/Notice.spec.ts.snap +++ b/packages/design-system/src/components/N8nNotice/__tests__/__snapshots__/Notice.spec.ts.snap @@ -1,31 +1,31 @@ // Vitest Snapshot v1 exports[`components > N8nNotice > props > content > should render HTML 1`] = ` -"
+"
- Hello world! This is a notice. + Hello world! This is a notice.
" `; exports[`components > N8nNotice > props > content > should render correctly with content prop 1`] = ` -"
+"
- This is a notice. + This is a notice.
" `; exports[`components > N8nNotice > props > content > should sanitize rendered HTML 1`] = ` -"
+"
- This is a notice. + This is a notice.
" `; exports[`components > N8nNotice > should render correctly 1`] = ` -"
+"
This is a notice.
diff --git a/packages/editor-ui/src/components/AboutModal.vue b/packages/editor-ui/src/components/AboutModal.vue index ba9408e91..8c5792687 100644 --- a/packages/editor-ui/src/components/AboutModal.vue +++ b/packages/editor-ui/src/components/AboutModal.vue @@ -34,6 +34,14 @@ + + + {{ $locale.baseText('about.instanceID') }} + + + {{ instanceId }} + +
@@ -64,6 +72,7 @@ export default Vue.extend({ }, computed: { ...mapGetters('settings', ['versionCli']), + ...mapGetters(['instanceId']), }, methods: { closeDialog() { @@ -76,5 +85,6 @@ export default Vue.extend({ diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue index c77034622..814eab0ac 100644 --- a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue +++ b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue @@ -38,12 +38,14 @@ @click="$emit('retest')" /> - + {{ $locale.baseText('credentialEdit.credentialConfig.needHelpFillingOutTheseFields') }} - - {{ $locale.baseText('credentialEdit.credentialConfig.openDocs') }} - - + + + {{ $locale.baseText('credentialEdit.credentialConfig.openDocs') }} + + +