Merge pull request #6914 from denschub/be-excellent

Add 'Be excellent to each other!' to the sidebar

Changelog.md

@@ -159,6 +159,7 @@ before.
 * Add links to the single post view of the related post to photos in the photo stream [#6621](https://github.com/diaspora/diaspora/pull/6621)
 * Add a note for people with disabled JavaScript [#6777](https://github.com/diaspora/diaspora/pull/6777)
 * Do not include conversation subject in notification mail [#6910](https://github.com/diaspora/diaspora/pull/6910)
+* Add 'Be excellent to each other!' to the sidebar [#6914](https://github.com/diaspora/diaspora/pull/6910)
 
 # 0.5.11.0
 

app/assets/stylesheets/navbar_left.scss

@@ -105,12 +105,20 @@
   margin-top: 20px;
   padding: 10px 20px 0;
 
+  .excellence-box,
   .info-links {
     border-top: 1px solid $border-grey;
-    margin-top: 10px;
     padding: 5px;
   }
 
+  .excellence-box {
+    margin-top: 10px;
+
+    .content {
+      font-size: $font-size-base;
+    }
+  }
+
   .section {
     margin-top: 10px;
 

app/views/streams/main_stream.html.haml

@@ -149,6 +149,11 @@
               %p
                 = link_to t("aspects.index.help.mail_podmin"), "mailto:#{AppConfig.admins.podmin_email}"
 
+        .excellence-box
+          .content
+            %p
+              = t("layouts.application.be_excellent")
+
         .info-links
           .content
             %ul

config/locales/diaspora/en.yml

@@ -589,6 +589,7 @@ en:
       public_feed: "Public diaspora* feed for %{name}"
       back_to_top: "Back to top"
       source_package: "Download the source code package"
+      be_excellent: "Be excellent to each other! ♥"
 
   notifications:
     started_sharing: