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:
Benjamin Neff 2017-01-04 02:33:00 +01:00
commit b632155772
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -10,6 +10,7 @@
# 0.6.3.0 # 0.6.3.0
## Refactor ## Refactor
* Increase the spacing above and below post contents [#7267](https://github.com/diaspora/diaspora/pull/7267)
## Bug fixes ## Bug fixes
* Fix background color of year on notifications page with dark theme [#7263](https://github.com/diaspora/diaspora/pull/7263) * Fix background color of year on notifications page with dark theme [#7263](https://github.com/diaspora/diaspora/pull/7263)

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

@ -96,7 +96,17 @@
font-size: $font-size-small; font-size: $font-size-small;
line-height: $font-size-small; line-height: $font-size-small;
} }
.post-content p:last-of-type { margin-bottom: 0; }
.post-content {
.markdown-content {
padding: .8em 0 .4em;
}
p:last-of-type {
margin-bottom: 0;
}
}
.nsfw-shield { .nsfw-shield {
color: $text-grey; color: $text-grey;
padding: 5px 10px; padding: 5px 10px;

2
config/diaspora.yml.example
View file

@ -249,7 +249,7 @@ configuration: ## Section
## Configure the protocol used to access the BOSH endpoint ## Configure the protocol used to access the BOSH endpoint
#proto: http #proto: http
## Configure the address that vines should listen on. ## Configure the address that prosody should listen on.
#address: '0.0.0.0' #address: '0.0.0.0'
## Configure the BOSH port. ## Configure the BOSH port.