Commit 0e356e1c authored by Peter Hegman's avatar Peter Hegman

Merge branch 'ph/346268/draftCommentAvatarSizeFix' into 'master'

Fixes diff draft note avatar sizes

See merge request gitlab-org/gitlab!75130
parents 461f5997 748c3373
...@@ -280,6 +280,7 @@ export default { ...@@ -280,6 +280,7 @@ export default {
v-if="showDraft(discussion.reply_id)" v-if="showDraft(discussion.reply_id)"
:key="`draft_${discussion.id}`" :key="`draft_${discussion.id}`"
:draft="draftForDiscussion(discussion.reply_id)" :draft="draftForDiscussion(discussion.reply_id)"
:line="line"
/> />
<div <div
v-else-if="canShowReplyActions && showReplies" v-else-if="canShowReplyActions && showReplies"
......
...@@ -16,10 +16,6 @@ $draft-actions-left-margin: 40px + $gl-padding; ...@@ -16,10 +16,6 @@ $draft-actions-left-margin: 40px + $gl-padding;
.draft-note-actions { .draft-note-actions {
margin: 0; margin: 0;
@include notes-media('min', map-get($grid-breakpoints, sm)) {
margin-left: $draft-actions-left-margin;
}
} }
} }
......
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