nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change design, add a link to the official website

Browse source 
fixes #7910

closes #7966
This commit is contained in:
flaburgan 2019-05-08 22:42:08 +02:00 committed by Benjamin Neff
parent e04ddd0bcc
commit 6826e89a95
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
4 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -5,6 +5,7 @@
## Bug fixes ## Bug fixes
## Features ## Features
* Add line mentioning diaspora\* on the splash page [#7966](https://github.com/diaspora/diaspora/pull/7966)
# 0.7.11.0 # 0.7.11.0

14
app/assets/stylesheets/home.scss
View file

@ -42,14 +42,12 @@
padding: 15px; padding: 15px;
} }
.clarification-header { .part-of-diaspora {
background-color: $grey; font-style: italic;
border: 1px solid $border-grey;
display: inline-block; a {
margin-bottom: 10px; color: $white;
margin-top: 10px; }
padding: 5px;
text-align: center;
} }
.login-form { .login-form {

4
app/views/home/default.haml
View file

@ -5,7 +5,9 @@
.col-md-8.text-center .col-md-8.text-center
%h1= t("home.default.headline", pod_name: pod_name) %h1= t("home.default.headline", pod_name: pod_name)
- if pod_name != "diaspora*" - if pod_name != "diaspora*"
%h2.clarification-header= t("home.default.clarify") %h2.part-of-diaspora
!= t("home.default.part_of_diaspora",
diaspora_site_link: link_to(t("home.default.diaspora_site_link"), "https://diasporafoundation.org/"))
%h2= t("home.default.byline") %h2= t("home.default.byline")
.col-md-4.login-form .col-md-4.login-form
= render partial: "sessions/form", locals: {mobile: false, resource: User.new, resource_name: :user} = render partial: "sessions/form", locals: {mobile: false, resource: User.new, resource_name: :user}

3
config/locales/diaspora/en.yml
View file

@ -553,7 +553,8 @@ en:
home: home:
default: default:
headline: "Welcome to %{pod_name}" headline: "Welcome to %{pod_name}"
clarify: "Part of the diaspora* federated network" part_of_diaspora: "Part of the %{diaspora_site_link}"
diaspora_site_link: "diaspora* federated network"
byline: "The online social world where you are in control" byline: "The online social world where you are in control"
be_who_you_want_to_be: "Be who you want to be" be_who_you_want_to_be: "Be who you want to be"
be_who_you_want_to_be_info: "A lot of networks insist that you use your real identity. Not diaspora*. Here you can choose who you want to be, and share as much or as little about yourself as you want. It really is up to you how you want to interact with other people." be_who_you_want_to_be_info: "A lot of networks insist that you use your real identity. Not diaspora*. Here you can choose who you want to be, and share as much or as little about yourself as you want. It really is up to you how you want to interact with other people."