Merge pull request #5743 from Flaburgan/change-make-something

Replace Make Something text by the diaspora ball logo on registration page

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)

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;
+    }
   }
 
   form {

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
 

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,<br/>MAKE<br/>SOMETHING."
-      diaspora: "<3 diaspora*"
       sign_up: "Sign up"
       email: "Email"
       username: "Username"