diff --git a/Changelog.md b/Changelog.md
index 6b8c88c8a..d72e62251 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -105,6 +105,7 @@ diaspora.yml file**. The existing settings from 0.4.x and before will not work a
* Rewrite slide effect in conversations as css transition for better performance [#5776](https://github.com/diaspora/diaspora/pull/5776)
* Various cleanups and improvements in the frontend code [#5781](https://github.com/diaspora/diaspora/pull/5781) [#5769](https://github.com/diaspora/diaspora/pull/5769) [#5763](https://github.com/diaspora/diaspora/pull/5763) [#5762](https://github.com/diaspora/diaspora/pull/5762) [#5758](https://github.com/diaspora/diaspora/pull/5758) [#5755](https://github.com/diaspora/diaspora/pull/5755) [#5747](https://github.com/diaspora/diaspora/pull/5747) [#5734](https://github.com/diaspora/diaspora/pull/5734) [#5786](https://github.com/diaspora/diaspora/pull/5786) [#5768](https://github.com/diaspora/diaspora/pull/5798)
* Add specs and validations to the role model [#5792](https://github.com/diaspora/diaspora/pull/5792)
+* Replace 'Make something' text by diaspora ball logo on registration page [#5743](https://github.com/diaspora/diaspora/pull/5743)
## Bug fixes
* orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158)
diff --git a/app/assets/stylesheets/new_styles/_registration.scss b/app/assets/stylesheets/new_styles/_registration.scss
index 0e013fcb4..4f759ad0c 100644
--- a/app/assets/stylesheets/new_styles/_registration.scss
+++ b/app/assets/stylesheets/new_styles/_registration.scss
@@ -1,29 +1,25 @@
#registration {
- & > .container-fluid {
- margin-top: 5%;
+ .ball {
+ height: 633px;
+ max-width: 100%;
+ background: url("branding/ball.png") no-repeat;
+ background-size: contain;
}
- #create-something-text {
- font-size : 100px;
- line-height : 100px;
- }
+ .v-center {
+ display: table;
+ height: 633px;
- #diaspora-hearts {
- font-size : 30px;
- margin-top : 0.2em;
- margin-bottom : 1em;
- white-space : nowrap;
- }
+ .content {
+ display: table-cell;
+ vertical-align: middle;
- #pod-name {
- text-align: center;
- margin: 12px;
- font-size : 35px;
- }
-
- #create-something-text,
- #diaspora-hearts {
- font-family : Roboto-Light;
+ #pod-name {
+ text-align: center;
+ margin: 12px;
+ font-size : 35px;
+ }
+ }
}
form {
diff --git a/app/views/registrations/new.haml b/app/views/registrations/new.haml
index e3b0d0529..6164b1d46 100644
--- a/app/views/registrations/new.haml
+++ b/app/views/registrations/new.haml
@@ -3,12 +3,9 @@
.row-fluid
.span10.offset1
.span7.hidden-phone
- %h1#create-something-text
- = t('.hey_make').html_safe
- %h3#diaspora-hearts
- = t('.diaspora')
- .span5
- .text-center
+ %h1.ball
+ .span5.v-center
+ .content.text-center
%h2#pod-name
= AppConfig.settings.pod_name
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index da5b55a5c..9e0b84550 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -1041,8 +1041,6 @@ en:
enter_username: "Pick a username (only letters, numbers, and underscores)"
enter_password: "Enter a password (six character minimum)"
enter_password_again: "Enter the same password as before"
- hey_make: "HEY,
MAKE
SOMETHING."
- diaspora: "<3 diaspora*"
sign_up: "Sign up"
email: "Email"
username: "Username"
diff --git a/graphics/ball.svg b/graphics/ball.svg
new file mode 100644
index 000000000..cd9fbd83e
--- /dev/null
+++ b/graphics/ball.svg
@@ -0,0 +1,217 @@
+
+
+
\ No newline at end of file