diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-06-07 17:30:11 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-06-07 17:30:11 +0000 |
| commit | be1e1cea5c192a9dd171a761d2a71f9e7f40384b (patch) | |
| tree | 4e997dc40da806e36476485c489756d83d20fc00 | |
| parent | dddb61a4c0620a1b3b9c3d734b2467d73be20897 (diff) | |
| parent | 81d66a27879e46de0d3b90fe9bc70a7b225a7cfb (diff) | |
| download | gitlab-ce-be1e1cea5c192a9dd171a761d2a71f9e7f40384b.tar.gz | |
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
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/61565-merge-request-discussion-text-jumps-when-resolved.yml | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index da341121087..d3aad23aa75 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -569,7 +569,7 @@ $note-form-margin-left: 72px; } .discussion-header { - min-height: 72px; + min-height: 74px; .note-header-info { padding-bottom: 0; @@ -582,8 +582,10 @@ $note-form-margin-left: 72px; } .unresolved { - .note-header-info { - margin-top: $gl-padding-8; + .discussion-header { + .note-header-info { + margin-top: $gl-padding-8; + } } } diff --git a/changelogs/unreleased/61565-merge-request-discussion-text-jumps-when-resolved.yml b/changelogs/unreleased/61565-merge-request-discussion-text-jumps-when-resolved.yml new file mode 100644 index 00000000000..718604c9ceb --- /dev/null +++ b/changelogs/unreleased/61565-merge-request-discussion-text-jumps-when-resolved.yml @@ -0,0 +1,5 @@ +--- +title: Resolve Merge request discussion text jumps when resolved +merge_request: 28995 +author: +type: fixed |