diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-01-09 18:47:03 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-01-09 18:47:03 +0300 |
| commit | 81aacf9c6f6c8565638ee340d5df96e2f7d1de53 (patch) | |
| tree | 8df5a895e384d861bf4ac8bb8a74e4c2f6ae0151 | |
| parent | e28e48eb6d41102ca4c72694d264cc8aa0448e0f (diff) | |
| parent | 3cfdda1cd504fea416aaaab62ce345e106772f99 (diff) | |
Merge branch '55958-inconsistent-spacing-between-note-and-user-avatar-in-discussions' into 'master'
Resolve "Inconsistent spacing between note and user avatar in discussions"
Closes #55958
See merge request gitlab-org/gitlab-ce!24197
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/55958-inconsistent-spacing-between-note-and-user-avatar-in-discussions.yml | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index a5b1eff3e1d..69b7b80dbf4 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -153,12 +153,12 @@ $note-form-margin-left: 72px; position: relative; .timeline-discussion-body { - margin-top: -8px; + margin-top: -$gl-padding-8; overflow-x: auto; overflow-y: hidden; - .discussion-resolved-text { - margin-bottom: 8px; + .note-body { + margin-top: $gl-padding-8; } } diff --git a/changelogs/unreleased/55958-inconsistent-spacing-between-note-and-user-avatar-in-discussions.yml b/changelogs/unreleased/55958-inconsistent-spacing-between-note-and-user-avatar-in-discussions.yml new file mode 100644 index 00000000000..765398cda84 --- /dev/null +++ b/changelogs/unreleased/55958-inconsistent-spacing-between-note-and-user-avatar-in-discussions.yml @@ -0,0 +1,5 @@ +--- +title: Fix spacing on discussions +merge_request: !24197 +author: +type: fixed |