From 03db9807d70fe4305ec0a1ef0e3a79bcaffd9e69 Mon Sep 17 00:00:00 2001 From: flaburgan Date: Tue, 3 Jan 2017 10:41:29 +0100 Subject: [PATCH 1/2] Remove Vines mention, fix #7262 closes #7264 --- config/diaspora.yml.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/diaspora.yml.example b/config/diaspora.yml.example index 4457d18fe..d4f0622e5 100644 --- a/config/diaspora.yml.example +++ b/config/diaspora.yml.example @@ -249,7 +249,7 @@ configuration: ## Section ## Configure the protocol used to access the BOSH endpoint #proto: http - ## Configure the address that vines should listen on. + ## Configure the address that prosody should listen on. #address: '0.0.0.0' ## Configure the BOSH port. From 8709d74c3e0f76a06dc41cc46c2e5d4522c3911b Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 3 Jan 2017 22:27:52 +0100 Subject: [PATCH 2/2] Increase the spacing above and below post contents closes #7267 --- Changelog.md | 1 + app/assets/stylesheets/stream_element.scss | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index a9a691456..c5e3e9dc3 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,7 @@ # 0.6.3.0 ## Refactor +* Increase the spacing above and below post contents [#7267](https://github.com/diaspora/diaspora/pull/7267) ## Bug fixes * Fix background color of year on notifications page with dark theme [#7263](https://github.com/diaspora/diaspora/pull/7263) diff --git a/app/assets/stylesheets/stream_element.scss b/app/assets/stylesheets/stream_element.scss index 317c8db7e..46352526c 100644 --- a/app/assets/stylesheets/stream_element.scss +++ b/app/assets/stylesheets/stream_element.scss @@ -96,7 +96,17 @@ font-size: $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 { color: $text-grey; padding: 5px 10px;