Merge branch 'stable' into develop

2015-06-16 23:43:32 +02:00 · 2015-06-16 23:43:32 +02:00 · ae0209b49b
commit ae0209b49b
parent bf69cb6d19 3a527d01da
2 changed files with 7 additions and 0 deletions
--- a/Changelog.md
+++ b/Changelog.md
@ -45,6 +45,7 @@ bind to an UNIX socket at `unix:tmp/diaspora.sock`. Please change your local

 ## Refactor
 * Update perfect-scrollbar [#6085](https://github.com/diaspora/diaspora/pull/6085)
+* Remove top margin for first heading in a post [#6110](https://github.com/diaspora/diaspora/pull/6110)

 ## Bug fixes
 * Precompile facebox images [#6105](https://github.com/diaspora/diaspora/pull/6105)
--- a/app/assets/stylesheets/markdown-content.scss
+++ b/app/assets/stylesheets/markdown-content.scss
@ -8,4 +8,10 @@
    &:first-child { margin-top: 0; }
    &:last-child { margin-bottom: 0; }
  }
+
+  h1, h2, h3, h4, h5, h6 {
+    &:first-child {
+      margin-top: 0;
+    }
+  }
 }