Commit 6aa2c9a4 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch '285507-fix-reply-box-border' into 'master'

Fix reply box border on diffs

See merge request gitlab-org/gitlab!52084
parents 0d37c9a7 61af16df
......@@ -16,9 +16,14 @@ export default {
},
render(h, { props, children }) {
if (props.isDiffDiscussion) {
return h('li', { class: 'discussion-collapsible bordered-box clearfix' }, [
h('ul', { class: 'notes' }, children),
]);
return h(
'li',
{
class:
'discussion-collapsible gl-border-solid gl-border-gray-100 gl-border-1 gl-rounded-base gl-overflow-hidden clearfix',
},
[h('ul', { class: 'notes' }, children)],
);
}
return children;
......
......@@ -265,7 +265,7 @@ export default {
<div
v-else-if="showReplies"
:class="{ 'is-replying': isReplying }"
class="discussion-reply-holder clearfix"
class="discussion-reply-holder gl-border-t-0! clearfix"
>
<user-avatar-link
v-if="!isReplying && userCanReply"
......
......@@ -159,7 +159,6 @@ $note-form-margin-left: 72px;
> li {
display: block;
position: relative;
border-bottom: 0;
&.being-posted {
pointer-events: none;
......
---
title: Fix reply box border on diffs
merge_request: 52084
author:
type: fixed
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