diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-11-12 23:00:46 +0000 |
|---|---|---|
| committer | Cindy Pallares <cindy@gitlab.com> | 2018-11-13 20:41:47 -0500 |
| commit | 7d3a9f2fd8fef5a8b0cd62b5f6d582a80a6a9992 (patch) | |
| tree | 04494c98e6d89007ae8398c88c5e6cdbd480de33 | |
| parent | 420a13e28dcebf5907f7104ae62f88d4942faed8 (diff) | |
| download | gitlab-ce-7d3a9f2fd8fef5a8b0cd62b5f6d582a80a6a9992.tar.gz | |
Merge branch 'align-vertical-discussion-line' into 'master'
Align all avatars and system notes in discussion
See merge request gitlab-org/gitlab-ce!22994
| -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 52d4139bceb..adcc3577a9c 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -1,6 +1,6 @@ $system-note-icon-size: 32px; $system-note-svg-size: 16px; -$note-form-margin-left: 70px; +$note-form-margin-left: 72px; @mixin vertical-line($left) { &::before { @@ -54,7 +54,7 @@ $note-form-margin-left: 70px; } .main-notes-list { - @include vertical-line(39px); + @include vertical-line(36px); } .notes { @@ -264,7 +264,7 @@ $note-form-margin-left: 70px; } .system-note { - padding: 6px $gl-padding-24; + padding: 6px 20px; margin: $gl-padding-24 0; background-color: transparent; |