diff options
| author | Phil Hughes <me@iamphill.com> | 2017-05-25 15:20:43 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-05-25 15:30:57 +0100 |
| commit | 91b22c2425a7b0491b1172f30c8d96611e270d4b (patch) | |
| tree | 2806e6b1a89fc03b6320968c9c4acf796afa1ca2 | |
| parent | 6ece9792666d5ac8670b4c275c42c6ec8998322d (diff) | |
| download | gitlab-ce-note-padding.tar.gz | |
Fixes missing bottom padding on notesnote-padding
Closes #32914
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 51918917329..5eb27799290 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -57,7 +57,7 @@ ul.notes { } .note { - padding: $gl-padding $gl-btn-padding 0; + padding: $gl-padding $gl-btn-padding; display: block; position: relative; border-bottom: 1px solid $white-normal; @@ -124,10 +124,14 @@ ul.notes { } } - .note-awards { - .js-awards-block { - margin-bottom: 16px; - } + .note-awards .awards, + .edited-text { + margin-top: $gl-padding; + margin-bottom: 0; + } + + .note-awards .awards { + margin-bottom: -6px; } .note-header { |