Commit 9eadb163 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 47722862 81aacf9c
......@@ -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;
}
}
......
---
title: Fix spacing on discussions
merge_request: !24197
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