nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5721 from sam09/fixissue5626

Browse source 
Added margin top to lists. Fixes issue #5626
This commit is contained in:
Steffen van Bergerem 2015-03-22 00:34:53 +01:00
commit 50c187537d
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -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)

7
app/assets/stylesheets/stream_element.scss
View file

@ -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;