diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-23 21:16:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-23 21:16:59 +0300 |
| commit | 94299354d10c1c4758883eb92df56255f32dcbe9 (patch) | |
| tree | fb5254b3ac33eb888e7a676ffa8234370026d7c9 /app/assets/javascripts/sidebar | |
| parent | 12f988e7dcb038e82144fcd159b94839044c54cb (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/sidebar')
| -rw-r--r-- | app/assets/javascripts/sidebar/components/severity/severity.vue | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/sidebar/components/severity/severity.vue b/app/assets/javascripts/sidebar/components/severity/severity.vue index 7e7d62256c9..0db856543d0 100644 --- a/app/assets/javascripts/sidebar/components/severity/severity.vue +++ b/app/assets/javascripts/sidebar/components/severity/severity.vue @@ -1,9 +1,11 @@ <script> import { GlIcon } from '@gitlab/ui'; +import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.vue'; export default { components: { GlIcon, + TooltipOnTruncate, }, props: { severity: { @@ -30,13 +32,15 @@ export default { <template> <div - class="incident-severity gl-display-inline-flex gl-align-items-center gl-justify-content-between" + class="incident-severity gl-display-inline-flex gl-align-items-center gl-justify-content-between gl-max-w-full" > <gl-icon :size="iconSize" :name="`severity-${severity.icon}`" :class="[`icon-${severity.icon}`, { 'gl-mr-3': !iconOnly }]" /> - <span v-if="!iconOnly">{{ severity.label }}</span> + <tooltip-on-truncate v-if="!iconOnly" :title="severity.label" class="gl-text-truncate">{{ + severity.label + }}</tooltip-on-truncate> </div> </template> |