Merge branch 'next-minor' into develop

2016-09-06 06:03:11 +02:00 · 2016-09-06 06:03:11 +02:00 · 99d8ca8414
commit 99d8ca8414
parent 09aef2f145 c6858d62a3
2 changed files with 2 additions and 1 deletions
--- a/Changelog.md
+++ b/Changelog.md
@ -20,6 +20,7 @@
 * Closed accounts will no longer show up in the account search [#7042](https://github.com/diaspora/diaspora/pull/7042)
 * Code blocks in conversations no longer overflow the content [#7055](https://github.com/diaspora/diaspora/pull/7055)
 * More buttons in mobile streams are fixed [#7036](https://github.com/diaspora/diaspora/pull/7036)
+* Fixed missing sidebar background in the contacts tab [#7064](https://github.com/diaspora/diaspora/pull/7064)

 ## Features
 * Deleted comments will be removed when loading more comments [#7045](https://github.com/diaspora/diaspora/pull/7045)
--- a/app/views/people/contacts.haml
+++ b/app/views/people/contacts.haml
@ -4,7 +4,7 @@
 .container-fluid#profile_container
  .row
    .col-md-3
-      #profile
+      .sidebar.profile-sidebar#profile
        -# here be JS

    .col-md-9