Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 22, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions packages/design-system/src/components/N8nMenuItem/MenuItem.vue
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion packages/design-system/src/components/N8nTooltip/Tooltip.vue
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,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
Loading