diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-01-09 18:47:03 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-01-11 00:10:30 +0300 |
| commit | 370b4ff7a4fbe08a18d718f29f8b5fd10f63ec7e (patch) | |
| tree | 83dc8728987d6bfc2a505a472b90e0cc738be715 /app | |
| parent | 8a75376dcc2820ea6af2dabdada30d9066113182 (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
(cherry picked from commit 81aacf9c6f6c8565638ee340d5df96e2f7d1de53)
2d5c1bd0 Adjust spacing for note header and resolved text
c7e902df Use gl-padding-8 as only variable
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 6 |
1 files changed, 3 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; } } |