diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-11-08 03:34:14 +0100 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-11-08 03:34:14 +0100 |
| commit | a6e492af00f5bea137ae571c50e3637ebb241401 (patch) | |
| tree | f56184eed77dd1531fce300e0963f789c0c46416 | |
| parent | 11d4acc9a68fd27dbe8dafb4788c4220b85edfff (diff) | |
| parent | 216f30da47d8f2cec7dfafa1bd62624711001022 (diff) | |
| download | gitlab-ce-_acet-discussion-redesign.tar.gz | |
Merge branch '_acet-discussion-redesign' of gitlab.com:gitlab-org/gitlab-ce into _acet-discussion-redesign_acet-discussion-redesign
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 11f9977b696..dcb1275d182 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -54,7 +54,7 @@ $note-form-margin-left: 70px; } .main-notes-list { - @include vertical-line(33px); + @include vertical-line(39px); } .notes { @@ -174,6 +174,7 @@ $note-form-margin-left: 70px; &.being-posted { pointer-events: none; opacity: 0.5; + padding: $gl-padding; .dummy-avatar { background-color: $gl-gray-200; @@ -267,7 +268,7 @@ $note-form-margin-left: 70px; } .system-note { - padding: 6px $gl-padding; + padding: 6px $gl-padding-24; margin: $gl-padding-24 0; background-color: transparent; @@ -309,7 +310,7 @@ $note-form-margin-left: 70px; height: $system-note-icon-size; border: 1px solid $border-color; border-radius: $system-note-icon-size; - margin: -6px $gl-padding 0 2px; + margin: -6px $gl-padding 0 0; svg { width: $system-note-svg-size; |