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

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2015-05-31 20:40:18 +02:00
commit c196ef11bb
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -51,6 +51,7 @@ Ruby 2.0 is no longer officially supported.
* Remove zip-zip workaround gem [#6001](https://github.com/diaspora/diaspora/pull/6001) * Remove zip-zip workaround gem [#6001](https://github.com/diaspora/diaspora/pull/6001)
* Cleanup and reorganize image assets [#6004](https://github.com/diaspora/diaspora/pull/6004) * Cleanup and reorganize image assets [#6004](https://github.com/diaspora/diaspora/pull/6004)
* Replace vendored assets for facebox by gem [#6005](https://github.com/diaspora/diaspora/pull/6005) * Replace vendored assets for facebox by gem [#6005](https://github.com/diaspora/diaspora/pull/6005)
* Improve styling of horizontal ruler in posts [#6016](https://github.com/diaspora/diaspora/pull/6016)
## Bug fixes ## Bug fixes
* Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846) * Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846)

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

@ -109,7 +109,11 @@
.collapsible { .collapsible {
overflow: hidden; overflow: hidden;
position: relative; position: relative;
.markdown-content hr {
width: 85%;
margin: 0.8em auto;
border-top: 1px solid $border-grey;
}
.expander { .expander {
position: absolute; position: absolute;
bottom: 0; bottom: 0;