From 2d8c62fae3aa33fdca51d5ced8e346da987c87f8 Mon Sep 17 00:00:00 2001
From: Dennis Schubert <mail@dennis-schubert.de>
Date: Mon, 11 Jul 2016 23:12:51 +0200
Subject: [PATCH] Add 'Be excellent to each other!' to the sidebar
---
app/assets/stylesheets/navbar_left.scss | 10 +++++++++-
app/views/streams/main_stream.html.haml | 5 +++++
config/locales/diaspora/en.yml | 1 +
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/app/assets/stylesheets/navbar_left.scss b/app/assets/stylesheets/navbar_left.scss
index df6df71ee1..5a7a585bfb 100644
--- a/app/assets/stylesheets/navbar_left.scss
+++ b/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;
diff --git a/app/views/streams/main_stream.html.haml b/app/views/streams/main_stream.html.haml
index b3bad24dd0..46f71957d4 100644
--- a/app/views/streams/main_stream.html.haml
+++ b/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
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index e5a89b8f4e..a5ee6a7793 100644
--- a/config/locales/diaspora/en.yml
+++ b/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:
--
GitLab