Unverified Commit 6826e89a authored by flaburgan's avatar flaburgan Committed by Benjamin Neff
Browse files

Change design, add a link to the official website 

fixes #7910

closes #7966
parent e04ddd0b

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
## Bug fixes



## Features

* Add line mentioning diaspora\* on the splash page [#7966](https://github.com/diaspora/diaspora/pull/7966)



# 0.7.11.0

app/assets/stylesheets/home.scss

+6 −8
Original line number Diff line number Diff line
@@ -42,14 +42,12 @@ 
    padding: 15px;

  }



  .clarification-header {

    background-color: $grey;

    border: 1px solid $border-grey;

    display: inline-block;

    margin-bottom: 10px;

    margin-top: 10px;

    padding: 5px;

    text-align: center;

  .part-of-diaspora {

    font-style: italic;



    a {

      color: $white;

    }

  }



  .login-form {

app/views/home/default.haml

+3 −1
Original line number Diff line number Diff line
@@ -5,7 +5,9 @@ 
        .col-md-8.text-center

          %h1= t("home.default.headline", pod_name: pod_name)

          - 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")

        .col-md-4.login-form

          = render partial: "sessions/form", locals: {mobile: false, resource: User.new, resource_name: :user}

config/locales/diaspora/en.yml

+2 −1
Original line number Diff line number Diff line
@@ -553,7 +553,8 @@ en: 
  home:

    default:

      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"

      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."