Merge branch 'outdated-discussion-padding' into 'master'

Fix padding of outdated discussion item. Old: ![Screen_Shot_2015-10-16_at_09.29.17](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d715debebe54d27c2eed7c22843e886c/Screen_Shot_2015-10-16_at_09.29.17.png) New: ![Screen_Shot_2015-10-16_at_09.29.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7c0c033adade92cb16406c027cb4c010/Screen_Shot_2015-10-16_at_09.29.23.png) It still looks the same when the discussion is expanded. See merge request !1614

Merge branch 'outdated-discussion-padding' into 'master'
38785046 · Dmitriy Zaporozhets · 64c2bccd · 33574c02 · 38785046 · 38785046
Commit 38785046 authored Oct 17, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

notes.scss app/assets/stylesheets/pages/notes.scss +4 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -69,6 +69,7 @@ v 8.1.0 (unreleased)
  - Only render 404 page from /public
  - Hide passwords from services API (Alex Lossent)
  - Fix: Images cannot show when projects' path was changed
+  - Fix padding of outdated discussion item.

 v 8.0.4
  - Fix Message-ID header to be RFC 2111-compliant to prevent e-mails being dropped (Stan Hu)

--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -30,7 +30,6 @@ ul.notes {
  .discussion-header,
  .note-header {
    @extend .cgray;
-    padding-bottom: 15px;

    a:hover {
      text-decoration: none;
@@ -75,6 +74,10 @@ ul.notes {
    }
  }

+  .discussion-body {
+    padding-top: 15px;
+  }
+
  .discussion {
    overflow: hidden;
    display: block;