From ef977a170f4169d4f16f7857aa7a156b64974433 Mon Sep 17 00:00:00 2001 From: flaburgan Date: Sun, 8 Mar 2015 20:17:04 +0100 Subject: [PATCH] Replace Make Something text by the diaspora ball logo on registration page Add ball.svg to /graphics --- .../stylesheets/new_styles/_registration.scss | 38 ++- app/views/registrations/new.haml | 9 +- config/locales/diaspora/en.yml | 2 - graphics/ball.svg | 217 ++++++++++++++++++ 4 files changed, 237 insertions(+), 29 deletions(-) create mode 100644 graphics/ball.svg 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 @@ + + + + Diaspora* Official Promo Artwork Toolkit + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Diaspora* Official Promo Artwork Toolkit + 2011-08-21 + + + Diaspora* + + + + + diaspora + distributed social network + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file