kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Annabel Dunstone Gray 2019-01-09 15:47:03 +00:00
parent e28e48eb6d 3cfdda1cd5
commit 81aacf9c6f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/stylesheets/pages/notes.scss
View File

@ -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;
}
}

5
changelogs/unreleased/55958-inconsistent-spacing-between-note-and-user-avatar-in-discussions.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix spacing on discussions
merge_request: !24197
author:
type: fixed