Merge pull request #5721 from sam09/fixissue5626

Added margin top to lists. Fixes issue #5626
diaspora · Mar 21, 2015 · 50c1875 · 50c1875
2 parents 9f058b1 + af410ef
commit 50c1875
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Changelog.md b/Changelog.md
@@ -155,6 +155,7 @@ diaspora.yml file**. The existing settings from 0.4.x and before will not work a
 * Display error messages for failed password change [#5580](https://github.com/diaspora/diaspora/pull/5580)
 * Display correct error message for too long tags [#5783](https://github.com/diaspora/diaspora/pull/5783)
 * Fix displaying reshares in the stream on mobile [#5790](https://github.com/diaspora/diaspora/pull/5790)
+* Remove bottom margin from lists that are the last element of a post. [#5721](https://github.com/diaspora/diaspora/pull/5721)
 
 ## Features
 * Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)

diff --git a/app/assets/stylesheets/stream_element.scss b/app/assets/stylesheets/stream_element.scss
@@ -140,7 +140,12 @@
     p:last-of-type {
       margin: 0;
     }
-
+    ul, ol {
+      margin-top:0.8em;
+      margin-bottom:0.8em;
+      &:first-child { margin-top: 0; }
+      &:nth-last-child(4){ margin-bottom: 0; }
+    }
     .expander {
       position: absolute;
       bottom: 0;