Skip to content

Commit

Permalink
fix(editor): Fix secondary icon for environments on sidebar menu item (
Browse files Browse the repository at this point in the history
  • Loading branch information
ivov committed Jan 22, 2024
1 parent a0aae45 commit a11e7cd
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,16 @@
<span :class="$style.label">{{ item.label }}</span>
<N8nTooltip
v-if="item.secondaryIcon"
:class="$style.secondaryIcon"
:placement="item.secondaryIcon?.tooltip?.placement || 'right'"
:content="item.secondaryIcon?.tooltip?.content"
:disabled="compact || !item.secondaryIcon?.tooltip?.content"
: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>
</ElMenuItem>
</ConditionalRouterLink>
Expand Down Expand Up @@ -274,6 +277,7 @@ export default defineComponent({
align-items: center;
justify-content: flex-end;
flex: 1;
margin-left: 20px;
}
.label {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<slot />
<template #content>
<slot name="content">
{{ content }}
<div v-html="content"></div>
</slot>
<div
v-if="buttons.length"
Expand Down
2 changes: 1 addition & 1 deletion packages/editor-ui/src/plugins/i18n/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@
"mainSidebar.showMessage.stopExecution.title": "Execution stopped",
"mainSidebar.templates": "Templates",
"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.workersView": "Workers",
"menuActions.duplicate": "Duplicate",
Expand Down

0 comments on commit a11e7cd

Please sign in to comment.