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

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Dennis Schubert 2017-03-28 06:42:53 +02:00
commit ec6a6d5138
No known key found for this signature in database
GPG key ID: 5A0304BEA7966D7E
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -27,6 +27,7 @@
* Increase maximal height of large thumbnail on mobile [#7383](https://github.com/diaspora/diaspora/pull/7383) * Increase maximal height of large thumbnail on mobile [#7383](https://github.com/diaspora/diaspora/pull/7383)
* Reduce conversation recipient size [#7376](https://github.com/diaspora/diaspora/pull/7376) * Reduce conversation recipient size [#7376](https://github.com/diaspora/diaspora/pull/7376)
* Cleanup rtl css [#7374](https://github.com/diaspora/diaspora/pull/7374) * Cleanup rtl css [#7374](https://github.com/diaspora/diaspora/pull/7374)
* Increase visual spacing between list items [#7401](https://github.com/diaspora/diaspora/pull/7401)
## Bug fixes ## Bug fixes
* Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379) * Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)

5
app/assets/stylesheets/markdown-content.scss
View file

@ -3,8 +3,9 @@
p:last-child { margin-bottom: 0; } p:last-child { margin-bottom: 0; }
ul, ol { ul, ol {
margin-top:0.8em; margin-bottom: .8em;
margin-bottom:0.8em; margin-top: .8em;
li { margin-bottom: .5em; }
&:first-child { margin-top: 0; } &:first-child { margin-top: 0; }
&:last-child { margin-bottom: 0; } &:last-child { margin-bottom: 0; }
} }