mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-01-11 12:57:29 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(editor): Fix secondary icon for environments on sidebar menu item (#8407)

Browse source
This commit is contained in:
Iván Ovejero 2024-01-22 12:28:21 +01:00 committed by GitHub
parent f35d4fcbd8
commit 35449667bf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/design-system/src/components/N8nMenuItem/MenuItem.vue
View file

@ -63,13 +63,16 @@
<span :class="$style.label">{{ item.label }}</span> <span :class="$style.label">{{ item.label }}</span>
<N8nTooltip <N8nTooltip
v-if="item.secondaryIcon" v-if="item.secondaryIcon"
:class="$style.secondaryIcon"
:placement="item.secondaryIcon?.tooltip?.placement || 'right'" :placement="item.secondaryIcon?.tooltip?.placement || 'right'"
:content="item.secondaryIcon?.tooltip?.content" :content="item.secondaryIcon?.tooltip?.content"
:disabled="compact || !item.secondaryIcon?.tooltip?.content" :disabled="compact || !item.secondaryIcon?.tooltip?.content"
:show-after="tooltipDelay" :show-after="tooltipDelay"
> >
<N8nIcon :icon="item.secondaryIcon.name" :size="item.secondaryIcon.size || 'small'" /> <N8nIcon
:class="$style.secondaryIcon"
:icon="item.secondaryIcon.name"
:size="item.secondaryIcon.size || 'small'"
/>
</N8nTooltip> </N8nTooltip>
</ElMenuItem> </ElMenuItem>
</ConditionalRouterLink> </ConditionalRouterLink>
@ -274,6 +277,7 @@ export default defineComponent({
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
flex: 1; flex: 1;
margin-left: 20px;
} }
.label { .label {

2
packages/design-system/src/components/N8nTooltip/Tooltip.vue
View file

@ -3,7 +3,7 @@
<slot /> <slot />
<template #content> <template #content>
<slot name="content"> <slot name="content">
{{ content }} <div v-html="content"></div>
</slot> </slot>
<div <div
v-if="buttons.length" v-if="buttons.length"

2
packages/editor-ui/src/plugins/i18n/locales/en.json
View file

@ -739,7 +739,7 @@
"mainSidebar.showMessage.stopExecution.title": "Execution stopped", "mainSidebar.showMessage.stopExecution.title": "Execution stopped",
"mainSidebar.templates": "Templates", "mainSidebar.templates": "Templates",
"mainSidebar.workflows": "Workflows", "mainSidebar.workflows": "Workflows",
"mainSidebar.workflows.readOnlyEnv.tooltip": "Protected mode is active, so no workflows changes are allowed. Change this in Settings, under 'Source Control'", "mainSidebar.workflows.readOnlyEnv.tooltip": "Protected instances prevent editing workflows (recommended for production environments). <a target=\"_blank\" href=\"https://docs.n8n.io/source-control-environments/\">More info</a>",
"mainSidebar.executions": "All executions", "mainSidebar.executions": "All executions",
"mainSidebar.workersView": "Workers", "mainSidebar.workersView": "Workers",
"menuActions.duplicate": "Duplicate", "menuActions.duplicate": "Duplicate",