Iterate Auth copy

res/css/structures/auth/_Login.scss

@@ -18,7 +18,7 @@ limitations under the License.
 .mx_Login_submit {
     @mixin mx_DialogButton;
     width: 100%;
-    margin-top: 35px;
+    margin-top: 24px;
     margin-bottom: 24px;
     box-sizing: border-box;
     text-align: center;
@@ -91,6 +91,8 @@ limitations under the License.
 }
 
 div.mx_AccessibleButton_kind_link.mx_Login_forgot {
+    display: block;
+    margin: 0 auto;
     // style it as a link
     font-size: inherit;
     padding: 0;

res/css/views/auth/_AuthBody.scss

@@ -146,6 +146,15 @@ limitations under the License.
     display: block;
     text-align: center;
     width: 100%;
+    margin-top: 24px;
+
+    > a {
+        font-weight: $font-semi-bold;
+    }
+}
+
+form + .mx_AuthBody_changeFlow {
+    margin-top: 0;
 }
 
 .mx_AuthBody_spinner {

src/components/structures/auth/Login.tsx

@@ -670,9 +670,11 @@ export default class LoginComponent extends React.Component<IProps, IState> {
             </div>;
         } else if (SettingsStore.getValue(UIFeature.Registration)) {
             footer = (
-                <a className="mx_AuthBody_changeFlow" onClick={this.onTryRegisterClick} href="#">
+                <span className="mx_AuthBody_changeFlow">
-                    { _t('Create account') }
+                    {_t("New? <a>Create account</a>", {}, {
-                </a>
+                        a: sub => <a onClick={this.onTryRegisterClick} href="#">{ sub }</a>,
+                    })}
+                </span>
             );
         }
 

src/components/structures/auth/Registration.tsx

@@ -650,9 +650,11 @@ export default class Registration extends React.Component<IProps, IState> {
             );
         }
 
-        const signIn = <a className="mx_AuthBody_changeFlow" onClick={this.onLoginClick} href="#">
+        const signIn = <span className="mx_AuthBody_changeFlow">
-            { _t('Sign in instead') }
+            {_t("Already have an account? <a>Sign in here</a>", {}, {
-        </a>;
+                a: sub => <a onClick={this.onLoginClick} href="#">{ sub }</a>,
+            })}
+        </span>;
 
         // Only show the 'go back' button if you're not looking at the form
         let goBack;
@@ -736,7 +738,7 @@ export default class Registration extends React.Component<IProps, IState> {
             }
 
             body = <div>
-                <h2>{ _t('Create your account') }</h2>
+                <h2>{ _t('Create account') }</h2>
                 { errorText }
                 { serverDeadSection }
                 { this.renderServerComponent() }

src/components/views/auth/PasswordLogin.tsx

@@ -411,20 +411,14 @@ export default class PasswordLogin extends React.PureComponent<IProps, IState> {
         let forgotPasswordJsx;
 
         if (this.props.onForgotPasswordClick) {
-            forgotPasswordJsx = <span>
+            forgotPasswordJsx = <AccessibleButton
-                {_t('Not sure of your password? <a>Set a new one</a>', {}, {
+                className="mx_Login_forgot"
-                    a: sub => (
+                disabled={this.props.busy}
-                        <AccessibleButton
+                kind="link"
-                            className="mx_Login_forgot"
+                onClick={this.onForgotPasswordClick}
-                            disabled={this.props.busy}
+            >
-                            kind="link"
+                {_t("Forgot password?")}
-                            onClick={this.onForgotPasswordClick}
+            </AccessibleButton>;
-                        >
-                            {sub}
-                        </AccessibleButton>
-                    ),
-                })}
-            </span>;
         }
 
         const pwFieldClass = classNames({

src/components/views/auth/RegistrationForm.tsx

@@ -540,17 +540,19 @@ export default class RegistrationForm extends React.PureComponent<IProps, IState
         if (this.showEmail()) {
             if (this.showPhoneNumber()) {
                 emailHelperText = <div>
-                    {_t(
+                    {
-                        "Set an email for account recovery. " +
+                        _t("Add an email to be able to reset your password.")
-                        "Use email or phone to optionally be discoverable by existing contacts.",
+                    } {
-                    )}
+                        _t("Use email or phone to optionally be discoverable by existing contacts.")
+                    }
                 </div>;
             } else {
                 emailHelperText = <div>
-                    {_t(
+                    {
-                        "Set an email for account recovery. " +
+                        _t("Add an email to be able to reset your password.")
-                        "Use email to optionally be discoverable by existing contacts.",
+                    } {
-                    )}
+                        _t("Use email to optionally be discoverable by existing contacts.")
+                    }
                 </div>;
             }
         }

src/i18n/strings/en_EN.json

@@ -2235,7 +2235,7 @@
     "Email": "Email",
     "Username": "Username",
     "Phone": "Phone",
-    "Not sure of your password? <a>Set a new one</a>": "Not sure of your password? <a>Set a new one</a>",
+    "Forgot password?": "Forgot password?",
     "Sign in with": "Sign in with",
     "Sign in": "Sign in",
     "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "No identity server is configured so you cannot add an email address in order to reset your password in the future.",
@@ -2247,8 +2247,9 @@
     "Use lowercase letters, numbers, dashes and underscores only": "Use lowercase letters, numbers, dashes and underscores only",
     "Phone (optional)": "Phone (optional)",
     "Register": "Register",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.",
+    "Add an email to be able to reset your password.": "Add an email to be able to reset your password.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Use email or phone to optionally be discoverable by existing contacts.",
+    "Use email to optionally be discoverable by existing contacts.": "Use email to optionally be discoverable by existing contacts.",
     "Enter your custom homeserver URL <a>What does this mean?</a>": "Enter your custom homeserver URL <a>What does this mean?</a>",
     "Homeserver URL": "Homeserver URL",
     "Enter your custom identity server URL <a>What does this mean?</a>": "Enter your custom identity server URL <a>What does this mean?</a>",
@@ -2456,10 +2457,11 @@
     "Syncing...": "Syncing...",
     "Signing In...": "Signing In...",
     "If you've joined lots of rooms, this might take a while": "If you've joined lots of rooms, this might take a while",
-    "Create account": "Create account",
+    "New? <a>Create account</a>": "New? <a>Create account</a>",
     "Unable to query for supported registration methods.": "Unable to query for supported registration methods.",
     "Registration has been disabled on this homeserver.": "Registration has been disabled on this homeserver.",
     "This server does not support authentication with a phone number.": "This server does not support authentication with a phone number.",
+    "Already have an account? <a>Sign in here</a>": "Already have an account? <a>Sign in here</a>",
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).",
     "Continue with previous account": "Continue with previous account",
     "<a>Log in</a> to your new account.": "<a>Log in</a> to your new account.",
@@ -2467,7 +2469,7 @@
     "Registration Successful": "Registration Successful",
     "Create your Matrix account on %(serverName)s": "Create your Matrix account on %(serverName)s",
     "Create your Matrix account on <underlinedServerName />": "Create your Matrix account on <underlinedServerName />",
-    "Create your account": "Create your account",
+    "Create account": "Create account",
     "Use Recovery Key or Passphrase": "Use Recovery Key or Passphrase",
     "Use Recovery Key": "Use Recovery Key",
     "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.",