Commit dbb342d4 authored by Fatih Acet's avatar Fatih Acet

Merge branch 'align-vertical-discussion-line' into 'master'

Align all avatars and system notes in discussion

See merge request gitlab-org/gitlab-ce!22994
parents ec3712c2 4c7a326f
$system-note-icon-size: 32px; $system-note-icon-size: 32px;
$system-note-svg-size: 16px; $system-note-svg-size: 16px;
$note-form-margin-left: 70px; $note-form-margin-left: 72px;
@mixin vertical-line($left) { @mixin vertical-line($left) {
&::before { &::before {
...@@ -54,7 +54,7 @@ $note-form-margin-left: 70px; ...@@ -54,7 +54,7 @@ $note-form-margin-left: 70px;
} }
.main-notes-list { .main-notes-list {
@include vertical-line(39px); @include vertical-line(36px);
} }
.notes { .notes {
...@@ -268,7 +268,7 @@ $note-form-margin-left: 70px; ...@@ -268,7 +268,7 @@ $note-form-margin-left: 70px;
} }
.system-note { .system-note {
padding: 6px $gl-padding-24; padding: 6px 20px;
margin: $gl-padding-24 0; margin: $gl-padding-24 0;
background-color: transparent; background-color: transparent;
......
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