Commit be1e1cea authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch '61565-merge-request-discussion-text-jumps-when-resolved' into 'master'

Resolve "Merge request discussion text jumps when resolved"

Closes #61565

See merge request gitlab-org/gitlab-ce!28995
parents dddb61a4 81d66a27
...@@ -569,7 +569,7 @@ $note-form-margin-left: 72px; ...@@ -569,7 +569,7 @@ $note-form-margin-left: 72px;
} }
.discussion-header { .discussion-header {
min-height: 72px; min-height: 74px;
.note-header-info { .note-header-info {
padding-bottom: 0; padding-bottom: 0;
...@@ -582,9 +582,11 @@ $note-form-margin-left: 72px; ...@@ -582,9 +582,11 @@ $note-form-margin-left: 72px;
} }
.unresolved { .unresolved {
.discussion-header {
.note-header-info { .note-header-info {
margin-top: $gl-padding-8; margin-top: $gl-padding-8;
} }
}
} }
.note-header { .note-header {
......
---
title: Resolve Merge request discussion text jumps when resolved
merge_request: 28995
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