Commit ef1a1587 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'image-discussion-ff-fix' into 'master'

Fixed image discussion styling

Closes #54110

See merge request gitlab-org/gitlab-ce!23127
parents e1d2a155 718c66f6
...@@ -415,7 +415,6 @@ span.idiff { ...@@ -415,7 +415,6 @@ span.idiff {
} }
.preview-container { .preview-container {
height: 100%;
overflow: auto; overflow: auto;
.file-container { .file-container {
......
...@@ -842,11 +842,15 @@ ...@@ -842,11 +842,15 @@
background-repeat: repeat; background-repeat: repeat;
} }
.diff-file-discussions + .discussion-form::before { .diff-file-discussions + .discussion-form {
padding: $gl-padding;
&::before {
width: auto; width: auto;
margin-left: -16px; margin-left: -$gl-padding;
margin-right: -16px; margin-right: -$gl-padding;
margin-bottom: 16px; margin-bottom: $gl-padding;
}
} }
.notes { .notes {
......
...@@ -433,14 +433,8 @@ $note-form-margin-left: 72px; ...@@ -433,14 +433,8 @@ $note-form-margin-left: 72px;
} }
.discussion-notes { .discussion-notes {
&:not(:first-child) {
border-top: 1px solid $white-normal;
margin-top: 20px;
}
&:not(:last-child) { &:not(:last-child) {
border-bottom: 1px solid $white-normal; margin-bottom: 0;
margin-bottom: 20px;
} }
.system-note { .system-note {
......
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