Merge branch 'next-minor' into develop

2017-02-05 10:34:48 +01:00 · 2017-02-05 10:34:48 +01:00 · 63077bfeaf
commit 63077bfeaf
parent 37cdc7c10e 690bbd9db3
3 changed files with 7 additions and 1 deletions
--- a/Changelog.md
+++ b/Changelog.md
@ -20,6 +20,7 @@

 ## Features
 * Add support for [Liberapay](https://liberapay.com) donations [#7290](https://github.com/diaspora/diaspora/pull/7290)
+* Added a link to the community guidelines :) [#7298](https://github.com/diaspora/diaspora/pull/7298)

 # 0.6.3.0

--- a/app/assets/stylesheets/navbar_left.scss
+++ b/app/assets/stylesheets/navbar_left.scss
@ -117,6 +117,11 @@
    .content {
      font-size: $font-size-base;
    }
+
+    a,
+    a:hover {
+      color: $link-grey;
+    }
  }

  .section {
--- a/app/views/streams/main_stream.html.haml
+++ b/app/views/streams/main_stream.html.haml
@ -152,7 +152,7 @@
        .excellence-box
          .content
            %p
-              = t("layouts.application.be_excellent")
+              = link_to t("layouts.application.be_excellent"), "https://diasporafoundation.org/community_guidelines"

        .info-links
          .content