From 2b19b4bfc9b957d2b15a7f9ae2c0d7ddc869e6aa Mon Sep 17 00:00:00 2001 From: flaburgan Date: Thu, 19 Feb 2015 00:07:41 +0100 Subject: [PATCH] Remove #sign-up-text, change placeholder text to lower-case, fix tests --- app/assets/stylesheets/new_styles/_forms.scss | 11 +---------- app/assets/stylesheets/new_styles/_registration.scss | 7 +------ app/views/passwords/edit.haml | 2 +- app/views/passwords/new.haml | 2 +- app/views/registrations/new.haml | 2 +- config/locales/devise/devise.en.yml | 6 +++--- config/locales/diaspora/en.yml | 12 ++++++------ features/desktop/accepts_invitation.feature | 4 ++-- features/desktop/invitations.feature | 2 +- features/desktop/signs_up.feature | 6 +++--- 10 files changed, 20 insertions(+), 34 deletions(-) diff --git a/app/assets/stylesheets/new_styles/_forms.scss b/app/assets/stylesheets/new_styles/_forms.scss index fd3b38f2a..51cd8b71d 100644 --- a/app/assets/stylesheets/new_styles/_forms.scss +++ b/app/assets/stylesheets/new_styles/_forms.scss @@ -100,16 +100,7 @@ form.block-form { top: 130px; } - input::-moz-placeholder { text-transform: uppercase; } - input::-webkit-input-placeholder { text-transform: uppercase; } - input:-ms-input-placeholder { text-transform: uppercase; } - } - - input[type=submit] { - text-align: center; - display: block; - width: 100%; - padding: 8px 0; + ::placeholder { text-transform: uppercase; } } } diff --git a/app/assets/stylesheets/new_styles/_registration.scss b/app/assets/stylesheets/new_styles/_registration.scss index 061db33b0..8dd83bd5f 100644 --- a/app/assets/stylesheets/new_styles/_registration.scss +++ b/app/assets/stylesheets/new_styles/_registration.scss @@ -21,13 +21,8 @@ font-size : 35px; } - #sign-up-text { - margin-bottom : 0.5em; - } - #create-something-text, - #diaspora-hearts, - #sign-up-text { + #diaspora-hearts { font-family : Roboto-Light; } diff --git a/app/views/passwords/edit.haml b/app/views/passwords/edit.haml index 8731edc34..804481bb8 100644 --- a/app/views/passwords/edit.haml +++ b/app/views/passwords/edit.haml @@ -23,7 +23,7 @@ = f.password_field :password_confirmation, class: "input-block-level form-control", required: true, placeholder: t('devise.passwords.edit.confirm_password'), autocapitalize: "none", autocorrect: "off" = hidden_field(:user, :remember_me, value: 1) - = f.submit t('devise.passwords.edit.change_password'), class: "btn" + = f.submit t('devise.passwords.edit.change_password'), class: "btn btn-block" .text-center = link_to t('devise.shared.links.sign_in'), new_session_path(resource_name) diff --git a/app/views/passwords/new.haml b/app/views/passwords/new.haml index b7a35f6a6..286a29d50 100644 --- a/app/views/passwords/new.haml +++ b/app/views/passwords/new.haml @@ -18,7 +18,7 @@ = t('devise.passwords.new.email') %i.entypo.mail = f.text_field :email, class: "input-block-level form-control", required: true, autocapitalize: "off", placeholder: t('devise.passwords.new.email'), autocorrect: "off", autofocus: true - = f.submit t('devise.passwords.new.send_password_instructions'), class: "btn" + = f.submit t('devise.passwords.new.send_password_instructions'), class: "btn btn-block" .text-center = link_to t('devise.shared.links.sign_in'), new_session_path(resource_name) diff --git a/app/views/registrations/new.haml b/app/views/registrations/new.haml index de24f2b31..e7f2c8b92 100644 --- a/app/views/registrations/new.haml +++ b/app/views/registrations/new.haml @@ -41,4 +41,4 @@ - if AppConfig.settings.terms.enable? %p#terms.text-center = t('.terms', terms_link: link_to(t('.terms_link'), terms_path, target: "_blank")).html_safe - = f.submit t('.sign_up'), class: "btn", data: {disable_with: t('.submitting')} + = f.submit t('.sign_up'), class: "btn btn-block btn-large", data: {disable_with: t('.submitting')} diff --git a/config/locales/devise/devise.en.yml b/config/locales/devise/devise.en.yml index b9465ff04..e1269d7bc 100644 --- a/config/locales/devise/devise.en.yml +++ b/config/locales/devise/devise.en.yml @@ -30,13 +30,13 @@ en: updated: 'Your password was changed successfully. You are now signed in.' edit: change_password: "Change my password" - new_password: "NEW PASSWORD" - confirm_password: "CONFIRM PASSWORD" + new_password: "New password" + confirm_password: "Confirm password" new: forgot_password: "Forgot your password?" no_account: 'No account with this email exists' reset_password: "Reset password" - email: "EMAIL ADDRESS" + email: "Email address" send_password_instructions: "Send me reset password instructions" confirmations: send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.' diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 79628c54d..d31afd681 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -839,7 +839,7 @@ en: Sign in here: %{login_url}. If you’ve forgotten your sign-in details, you can ask for a reminder on that page. Hoping to see you again, - + The diaspora* email robot! people: zero: "No people" @@ -1009,11 +1009,11 @@ en: 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" - password: "PASSWORD" - password_confirmation: "PASSWORD CONFIRMATION" + sign_up: "Sign up" + email: "Email" + username: "Username" + password: "Password" + password_confirmation: "Password confirmation" submitting: "Submitting..." terms: "By creating an account you accept the %{terms_link}." terms_link: "terms of service" diff --git a/features/desktop/accepts_invitation.feature b/features/desktop/accepts_invitation.feature index cf6923e04..5588bc806 100644 --- a/features/desktop/accepts_invitation.feature +++ b/features/desktop/accepts_invitation.feature @@ -4,7 +4,7 @@ Feature: invitation acceptance Given I have been invited by an admin And I am on my acceptance form page And I fill in the new user form - And I press "Continue" + And I press "Sign up" Then I should be on the getting started page And I should see "Well, hello there!" And I fill in the following: @@ -19,7 +19,7 @@ Feature: invitation acceptance Given I have been invited by bob And I am on my acceptance form page And I fill in the new user form - And I press "Continue" + And I press "Sign up" Then I should be on the getting started page And I should see "Well, hello there!" And I fill in the following: diff --git a/features/desktop/invitations.feature b/features/desktop/invitations.feature index 291869a44..ac94f985d 100644 --- a/features/desktop/invitations.feature +++ b/features/desktop/invitations.feature @@ -5,6 +5,6 @@ Feature: Invitations When I visit alice's invitation code url # Then I should see the "alice is excited" message When I fill in the new user form - And I press "Continue" + And I press "Sign up" Then I should see the "welcome to diaspora" message And I should be able to friend Alice diff --git a/features/desktop/signs_up.feature b/features/desktop/signs_up.feature index 83aa6ac9c..46ee98c3f 100644 --- a/features/desktop/signs_up.feature +++ b/features/desktop/signs_up.feature @@ -71,20 +71,20 @@ Feature: new user registration And I go to the new user registration page And I fill in the following: | user_username | $%&(/&%$&/=)(/ | - And I press "Continue" + And I press "Sign up" Then I should not be able to sign up And I should have a validation error on "user_username, user_password, user_email" When I fill in the following: | user_username | valid_user | | user_email | this is not a valid email $%&/()( | - And I press "Continue" + And I press "Sign up" Then I should not be able to sign up And I should have a validation error on "user_password, user_email" When I fill in the following: | user_email | valid@email.com | | user_password | 1 | - And I press "Continue" + And I press "Sign up" Then I should not be able to sign up And I should have a validation error on "user_password, user_password_confirmation"