Commit d217c3aa authored by Natalia Tepluhina's avatar Natalia Tepluhina Committed by Vitaly Slobodin

Resolve "On design discussion note, icons are misaligned"

parent 682ec79a
<script> <script>
/* eslint-disable vue/no-v-html */
import { ApolloMutation } from 'vue-apollo'; import { ApolloMutation } from 'vue-apollo';
import { GlTooltipDirective, GlIcon, GlLink } from '@gitlab/ui'; import { GlTooltipDirective, GlIcon, GlLink, GlSafeHtmlDirective } from '@gitlab/ui';
import updateNoteMutation from '../../graphql/mutations/update_note.mutation.graphql'; import updateNoteMutation from '../../graphql/mutations/update_note.mutation.graphql';
import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue'; import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue';
...@@ -22,6 +21,7 @@ export default { ...@@ -22,6 +21,7 @@ export default {
}, },
directives: { directives: {
GlTooltip: GlTooltipDirective, GlTooltip: GlTooltipDirective,
SafeHtml: GlSafeHtmlDirective,
}, },
props: { props: {
note: { note: {
...@@ -94,7 +94,7 @@ export default { ...@@ -94,7 +94,7 @@ export default {
:data-username="author.username" :data-username="author.username"
> >
<span class="note-header-author-name gl-font-weight-bold">{{ author.name }}</span> <span class="note-header-author-name gl-font-weight-bold">{{ author.name }}</span>
<span v-if="author.status_tooltip_html" v-html="author.status_tooltip_html"></span> <span v-if="author.status_tooltip_html" v-safe-html="author.status_tooltip_html"></span>
<span class="note-headline-light">@{{ author.username }}</span> <span class="note-headline-light">@{{ author.username }}</span>
</gl-link> </gl-link>
<span class="note-headline-light note-headline-meta"> <span class="note-headline-light note-headline-meta">
...@@ -107,7 +107,7 @@ export default { ...@@ -107,7 +107,7 @@ export default {
</gl-link> </gl-link>
</span> </span>
</div> </div>
<div class="gl-display-flex"> <div class="gl-display-flex gl-align-items-baseline">
<slot name="resolveDiscussion"></slot> <slot name="resolveDiscussion"></slot>
<button <button
v-if="isEditButtonVisible" v-if="isEditButtonVisible"
...@@ -123,9 +123,9 @@ export default { ...@@ -123,9 +123,9 @@ export default {
</div> </div>
<template v-if="!isEditing"> <template v-if="!isEditing">
<div <div
v-safe-html="note.bodyHtml"
class="note-text js-note-text md" class="note-text js-note-text md"
data-qa-selector="note_content" data-qa-selector="note_content"
v-html="note.bodyHtml"
></div> ></div>
<slot name="resolvedStatus"></slot> <slot name="resolvedStatus"></slot>
</template> </template>
......
---
title: Resolve On design discussion note, icons are misaligned
merge_request: 42672
author:
type: fixed
...@@ -60,7 +60,7 @@ exports[`Design note component should match the snapshot 1`] = ` ...@@ -60,7 +60,7 @@ exports[`Design note component should match the snapshot 1`] = `
</div> </div>
<div <div
class="gl-display-flex" class="gl-display-flex gl-align-items-baseline"
> >
<!----> <!---->
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment