diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-11-12 23:00:46 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-11-12 23:00:46 +0000 |
| commit | dbb342d4d95d24a1313c64be4a923ea5f759d3fa (patch) | |
| tree | 785b475d9d40b3fd9eef54b599fa1cd429587dd6 | |
| parent | ec3712c20167d40cb40b6932abb51ba0d4f58c20 (diff) | |
| parent | 4c7a326f8cb6e5110707978623499e645ea12009 (diff) | |
| download | gitlab-ce-dbb342d4d95d24a1313c64be4a923ea5f759d3fa.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 c57c1eee350..1b957f6cc69 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 { @@ -268,7 +268,7 @@ $note-form-margin-left: 70px; } .system-note { - padding: 6px $gl-padding-24; + padding: 6px 20px; margin: $gl-padding-24 0; background-color: transparent; |