From 2f89af4fa04bab728e32cf72d3b2711bcd3ac58b Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 23 Jan 2019 12:10:25 -0600 Subject: [PATCH 01/10] Update login header text --- res/css/views/auth/_AuthPage.scss | 6 +++--- src/components/structures/auth/Login.js | 7 ++++--- src/i18n/strings/en_EN.json | 9 ++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/res/css/views/auth/_AuthPage.scss b/res/css/views/auth/_AuthPage.scss index 9e32750771..04dab59ed6 100644 --- a/res/css/views/auth/_AuthPage.scss +++ b/res/css/views/auth/_AuthPage.scss @@ -24,9 +24,9 @@ limitations under the License. } .mx_AuthPage h2 { - font-weight: 300; - margin-top: 32px; - margin-bottom: 20px; + font-size: 24px; + font-weight: 600; + margin-top: 8px; } .mx_AuthPage_modal { diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js index 28c4a3e960..611bea5284 100644 --- a/src/components/structures/auth/Login.js +++ b/src/components/structures/auth/Login.js @@ -544,8 +544,6 @@ module.exports = React.createClass({ delayTimeMs={1000} />; } - const header =

{ _t('Sign in') } { loader }

; - let errorTextSection; if (errorText) { errorTextSection = ( @@ -559,7 +557,10 @@ module.exports = React.createClass({ - { header } +

+ {_t('Sign in to your account')} + {loader} +

{ errorTextSection } { this.componentForStep(this.state.currentFlow) } { serverConfig } diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 6bf857be07..65b9b160bc 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -431,6 +431,7 @@ "Encrypted by an unverified device": "Encrypted by an unverified device", "Unencrypted message": "Unencrypted message", "Please select the destination room for this message": "Please select the destination room for this message", + "Scroll to bottom of page": "Scroll to bottom of page", "Blacklisted": "Blacklisted", "Verified": "Verified", "Unverified": "Unverified", @@ -1065,6 +1066,8 @@ "Set status": "Set status", "Set a new status...": "Set a new status...", "View Community": "View Community", + "Login": "Login", + "powered by Matrix": "powered by Matrix", "Robot check is currently unavailable on desktop - please use a web browser": "Robot check is currently unavailable on desktop - please use a web browser", "This Home Server would like to make sure you are not a robot": "This Home Server would like to make sure you are not a robot", "Custom Server Options": "Custom Server Options", @@ -1082,7 +1085,6 @@ "Please enter the code it contains:": "Please enter the code it contains:", "Code": "Code", "Start authentication": "Start authentication", - "powered by Matrix": "powered by Matrix", "The email field must not be blank.": "The email field must not be blank.", "The user name field must not be blank.": "The user name field must not be blank.", "The phone number field must not be blank.": "The phone number field must not be blank.", @@ -1155,7 +1157,6 @@ "Couldn't load home page": "Couldn't load home page", "You are currently using Riot anonymously as a guest.": "You are currently using Riot anonymously as a guest.", "If you would like to create a Matrix account you can register now.": "If you would like to create a Matrix account you can register now.", - "Login": "Login", "Invalid configuration: Cannot supply a default homeserver URL and a default server name": "Invalid configuration: Cannot supply a default homeserver URL and a default server name", "Failed to reject invitation": "Failed to reject invitation", "This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.", @@ -1197,7 +1198,6 @@ "Directory": "Directory", "Search for a room": "Search for a room", "#example": "#example", - "Scroll to bottom of page": "Scroll to bottom of page", "Message not sent due to unknown devices being present": "Message not sent due to unknown devices being present", "Show devices, send anyway or cancel.": "Show devices, send anyway or cancel.", "You can't send any messages until you review and agree to our terms and conditions.": "You can't send any messages until you review and agree to our terms and conditions.", @@ -1209,8 +1209,6 @@ "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|one": "Resend message or cancel message now.", "Connectivity to the server has been lost.": "Connectivity to the server has been lost.", "Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.", - "%(count)s new messages|other": "%(count)s new messages", - "%(count)s new messages|one": "%(count)s new message", "Active call": "Active call", "There's no one else here! Would you like to invite others or stop warning about the empty room?": "There's no one else here! Would you like to invite others or stop warning about the empty room?", "You seem to be uploading files, are you sure you want to quit?": "You seem to be uploading files, are you sure you want to quit?", @@ -1336,6 +1334,7 @@ "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.", "Sign in with single sign-on": "Sign in with single sign-on", "Try the app first": "Try the app first", + "Sign in to your account": "Sign in to your account", "Failed to fetch avatar URL": "Failed to fetch avatar URL", "Set a display name:": "Set a display name:", "Upload an avatar:": "Upload an avatar:", From e396954a2025e4c53d3762238b41bcd552555c31 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 23 Jan 2019 13:11:01 -0600 Subject: [PATCH 02/10] Update forgot password link text and style --- res/css/structures/auth/_Login.scss | 8 -------- res/css/views/auth/_AuthBody.scss | 9 +++++++++ res/themes/dharma/css/_dharma.scss | 1 + res/themes/light/css/_base.scss | 1 + src/components/views/auth/PasswordLogin.js | 15 ++++++++++----- src/i18n/strings/en_EN.json | 2 +- 6 files changed, 22 insertions(+), 14 deletions(-) diff --git a/res/css/structures/auth/_Login.scss b/res/css/structures/auth/_Login.scss index 09af69183b..ac4ea98f28 100644 --- a/res/css/structures/auth/_Login.scss +++ b/res/css/structures/auth/_Login.scss @@ -87,14 +87,6 @@ limitations under the License. font-size: 13px; } -.mx_Login_forgot { - font-size: 15px; -} - -.mx_Login_forgot:link { - color: $primary-fg-color; -} - .mx_Login_sso_link { display: block; text-align: center; diff --git a/res/css/views/auth/_AuthBody.scss b/res/css/views/auth/_AuthBody.scss index 97632c2e3f..93e7dd01e6 100644 --- a/res/css/views/auth/_AuthBody.scss +++ b/res/css/views/auth/_AuthBody.scss @@ -20,4 +20,13 @@ limitations under the License. border-radius: 0 4px 4px 0; padding: 25px 60px; box-sizing: border-box; + font-size: 12px; + color: $authpage-body-color; +} + +.mx_AuthBody a:link, +.mx_AuthBody a:hover, +.mx_AuthBody a:visited { + color: $accent-color; + text-decoration: none; } diff --git a/res/themes/dharma/css/_dharma.scss b/res/themes/dharma/css/_dharma.scss index 22aa018b5e..e30d6f0000 100644 --- a/res/themes/dharma/css/_dharma.scss +++ b/res/themes/dharma/css/_dharma.scss @@ -217,6 +217,7 @@ $authpage-bg-color: #2e3649; $authpage-modal-bg-color: rgba(255, 255, 255, 0.59); $authpage-body-bg-color: #ffffff; $authpage-lang-color: #4e5054; +$authpage-body-color: #61708b; /*** form elements ***/ diff --git a/res/themes/light/css/_base.scss b/res/themes/light/css/_base.scss index 438ab69856..0f0a2639fa 100644 --- a/res/themes/light/css/_base.scss +++ b/res/themes/light/css/_base.scss @@ -213,6 +213,7 @@ $authpage-bg-color: #2e3649; $authpage-modal-bg-color: rgba(255, 255, 255, 0.59); $authpage-body-bg-color: #ffffff; $authpage-lang-color: #4e5054; +$authpage-body-color: #61708b; // ***** Mixins! ***** diff --git a/src/components/views/auth/PasswordLogin.js b/src/components/views/auth/PasswordLogin.js index 1d36c52a24..26baabec5c 100644 --- a/src/components/views/auth/PasswordLogin.js +++ b/src/components/views/auth/PasswordLogin.js @@ -245,11 +245,16 @@ class PasswordLogin extends React.Component { let forgotPasswordJsx; if (this.props.onForgotPasswordClick) { - forgotPasswordJsx = ( - - { _t('Forgot your password?') } - - ); + forgotPasswordJsx = + {_t('Not sure of your password? Set a new one', {}, { + a: sub => + {sub} + , + })} + ; } let matrixIdText = _t('Matrix ID'); diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 65b9b160bc..e8f82959b3 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1092,7 +1092,7 @@ "Username on %(hs)s": "Username on %(hs)s", "User name": "User name", "Mobile phone number": "Mobile phone number", - "Forgot your password?": "Forgot your password?", + "Not sure of your password? Set a new one": "Not sure of your password? Set a new one", "%(serverName)s Matrix ID": "%(serverName)s Matrix ID", "Sign in with": "Sign in with", "Sign in": "Sign in", From 2bb5a1d6efdc23e560c873f021180d24c1ba4ef4 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 23 Jan 2019 13:19:32 -0600 Subject: [PATCH 03/10] Clear out other login link styles --- res/css/structures/auth/_Login.scss | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/res/css/structures/auth/_Login.scss b/res/css/structures/auth/_Login.scss index ac4ea98f28..84f43e0ca6 100644 --- a/res/css/structures/auth/_Login.scss +++ b/res/css/structures/auth/_Login.scss @@ -73,12 +73,6 @@ limitations under the License. display: block; text-align: center; width: 100%; - font-size: 13px; - opacity: 0.8; -} - -.mx_Login_create:link { - color: $primary-fg-color; } .mx_Login_prompt { @@ -90,14 +84,9 @@ limitations under the License. .mx_Login_sso_link { display: block; text-align: center; - font-size: 15px; margin-bottom: 20px; } -.mx_Login_sso_link:link { - color: $primary-fg-color; -} - .mx_Login_loader { display: inline; position: relative; From e0e873d0a8779850e50aac644aa166f92e813d39 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 23 Jan 2019 14:24:20 -0600 Subject: [PATCH 04/10] Remove create account from forgot password --- src/components/structures/MatrixChat.js | 1 - src/components/structures/auth/ForgotPassword.js | 10 ---------- src/i18n/strings/en_EN.json | 2 +- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index 4c783eedac..d5ad130edd 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -1955,7 +1955,6 @@ export default React.createClass({ customHsUrl={this.getCurrentHsUrl()} customIsUrl={this.getCurrentIsUrl()} onComplete={this.onLoginClick} - onRegisterClick={this.onRegisterClick} onLoginClick={this.onLoginClick} /> ); } diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js index b2dc2a47eb..3ff459d20e 100644 --- a/src/components/structures/auth/ForgotPassword.js +++ b/src/components/structures/auth/ForgotPassword.js @@ -34,7 +34,6 @@ module.exports = React.createClass({ customHsUrl: PropTypes.string, customIsUrl: PropTypes.string, onLoginClick: PropTypes.func, - onRegisterClick: PropTypes.func, onComplete: PropTypes.func.isRequired, // The default server name to use when the user hasn't specified @@ -168,12 +167,6 @@ module.exports = React.createClass({ this.props.onLoginClick(); }, - onRegisterClick: function(ev) { - ev.preventDefault(); - ev.stopPropagation(); - this.props.onRegisterClick(); - }, - showErrorDialog: function(body, title) { const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); Modal.createTrackedDialog('Forgot Password Error', '', ErrorDialog, { @@ -266,9 +259,6 @@ module.exports = React.createClass({ { _t('Return to login screen') } - - { _t('Create an account') } - ); diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index e8f82959b3..786531fb02 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1316,7 +1316,6 @@ "New password": "New password", "Confirm your new password": "Confirm your new password", "Send Reset Email": "Send Reset Email", - "Create an account": "Create an account", "Invalid homeserver discovery response": "Invalid homeserver discovery response", "Invalid identity server discovery response": "Invalid identity server discovery response", "General failure": "General failure", @@ -1335,6 +1334,7 @@ "Sign in with single sign-on": "Sign in with single sign-on", "Try the app first": "Try the app first", "Sign in to your account": "Sign in to your account", + "Create an account": "Create an account", "Failed to fetch avatar URL": "Failed to fetch avatar URL", "Set a display name:": "Set a display name:", "Upload an avatar:": "Upload an avatar:", From 9b3d674a92ade16ede64b4571ce7a0421de7ed02 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 23 Jan 2019 14:30:09 -0600 Subject: [PATCH 05/10] Rename links for changing auth flow --- res/css/structures/auth/_Login.scss | 6 ------ res/css/views/auth/_AuthBody.scss | 6 ++++++ src/components/structures/auth/ForgotPassword.js | 2 +- src/components/structures/auth/Login.js | 4 ++-- src/components/structures/auth/Registration.js | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/res/css/structures/auth/_Login.scss b/res/css/structures/auth/_Login.scss index 84f43e0ca6..e3eadddae8 100644 --- a/res/css/structures/auth/_Login.scss +++ b/res/css/structures/auth/_Login.scss @@ -69,12 +69,6 @@ limitations under the License. margin-right: 10px; } -.mx_Login_create { - display: block; - text-align: center; - width: 100%; -} - .mx_Login_prompt { padding-top: 15px; padding-bottom: 15px; diff --git a/res/css/views/auth/_AuthBody.scss b/res/css/views/auth/_AuthBody.scss index 93e7dd01e6..cb28d57801 100644 --- a/res/css/views/auth/_AuthBody.scss +++ b/res/css/views/auth/_AuthBody.scss @@ -30,3 +30,9 @@ limitations under the License. color: $accent-color; text-decoration: none; } + +.mx_Auth_changeFlow { + display: block; + text-align: center; + width: 100%; +} diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js index 3ff459d20e..513be46544 100644 --- a/src/components/structures/auth/ForgotPassword.js +++ b/src/components/structures/auth/ForgotPassword.js @@ -256,7 +256,7 @@ module.exports = React.createClass({ { serverConfigSection } { errorText } - + { _t('Return to login screen') } diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js index 611bea5284..6cc60248ab 100644 --- a/src/components/structures/auth/Login.js +++ b/src/components/structures/auth/Login.js @@ -526,7 +526,7 @@ module.exports = React.createClass({ let loginAsGuestJsx; if (this.props.enableGuest) { loginAsGuestJsx = - + { _t('Try the app first') } ; } @@ -564,7 +564,7 @@ module.exports = React.createClass({ { errorTextSection } { this.componentForStep(this.state.currentFlow) } { serverConfig } - + { _t('Create an account') } { loginAsGuestJsx } diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js index fb913b22e1..fbc5aa1386 100644 --- a/src/components/structures/auth/Registration.js +++ b/src/components/structures/auth/Registration.js @@ -465,7 +465,7 @@ module.exports = React.createClass({ let signIn; if (!this.state.doingUIAuth) { signIn = ( - + { _t('I already have an account') } ); From f069833ad9bc5933717420f09c481d30586e04a5 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 23 Jan 2019 14:33:56 -0600 Subject: [PATCH 06/10] Update text to change auth flows --- src/components/structures/auth/ForgotPassword.js | 2 +- src/components/structures/auth/Login.js | 2 +- src/components/structures/auth/Registration.js | 2 +- src/i18n/strings/en_EN.json | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js index 513be46544..0a725808e0 100644 --- a/src/components/structures/auth/ForgotPassword.js +++ b/src/components/structures/auth/ForgotPassword.js @@ -257,7 +257,7 @@ module.exports = React.createClass({ { serverConfigSection } { errorText } - { _t('Return to login screen') } + { _t('Sign in instead') } diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js index 6cc60248ab..cac17554c8 100644 --- a/src/components/structures/auth/Login.js +++ b/src/components/structures/auth/Login.js @@ -565,7 +565,7 @@ module.exports = React.createClass({ { this.componentForStep(this.state.currentFlow) } { serverConfig } - { _t('Create an account') } + { _t('Create account') } { loginAsGuestJsx } diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js index fbc5aa1386..8ab27c3035 100644 --- a/src/components/structures/auth/Registration.js +++ b/src/components/structures/auth/Registration.js @@ -466,7 +466,7 @@ module.exports = React.createClass({ if (!this.state.doingUIAuth) { signIn = ( - { _t('I already have an account') } + { _t('Sign in instead') } ); } diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 786531fb02..464cce7980 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1316,6 +1316,7 @@ "New password": "New password", "Confirm your new password": "Confirm your new password", "Send Reset Email": "Send Reset Email", + "Sign in instead": "Sign in instead", "Invalid homeserver discovery response": "Invalid homeserver discovery response", "Invalid identity server discovery response": "Invalid identity server discovery response", "General failure": "General failure", @@ -1334,7 +1335,7 @@ "Sign in with single sign-on": "Sign in with single sign-on", "Try the app first": "Try the app first", "Sign in to your account": "Sign in to your account", - "Create an account": "Create an account", + "Create account": "Create account", "Failed to fetch avatar URL": "Failed to fetch avatar URL", "Set a display name:": "Set a display name:", "Upload an avatar:": "Upload an avatar:", @@ -1349,7 +1350,7 @@ "A phone number is required to register on this homeserver.": "A phone number is required to register on this homeserver.", "You need to enter a user name.": "You need to enter a user name.", "An unknown error occurred.": "An unknown error occurred.", - "I already have an account": "I already have an account", + "Create an account": "Create an account", "Commands": "Commands", "Results from DuckDuckGo": "Results from DuckDuckGo", "Emoji": "Emoji", From 8241f09b12ddada227a197589bf775a78fff1b82 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 23 Jan 2019 15:00:06 -0600 Subject: [PATCH 07/10] Update registration header text --- src/components/structures/auth/Registration.js | 3 +-- src/i18n/strings/en_EN.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js index 8ab27c3035..8abd4073fe 100644 --- a/src/components/structures/auth/Registration.js +++ b/src/components/structures/auth/Registration.js @@ -457,7 +457,6 @@ module.exports = React.createClass({ let errorText; const err = this.state.errorText || this.props.defaultServerDiscoveryError; - const header =

{ _t('Create an account') }

; if (err) { errorText =
{ err }
; } @@ -480,7 +479,7 @@ module.exports = React.createClass({ null} /> - { header } +

{ _t('Create your account') }

{ registerBody } { signIn } { errorText } diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 464cce7980..3137313146 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1350,7 +1350,7 @@ "A phone number is required to register on this homeserver.": "A phone number is required to register on this homeserver.", "You need to enter a user name.": "You need to enter a user name.", "An unknown error occurred.": "An unknown error occurred.", - "Create an account": "Create an account", + "Create your account": "Create your account", "Commands": "Commands", "Results from DuckDuckGo": "Results from DuckDuckGo", "Emoji": "Emoji", From df76a312c2ba0883cb240113b23923964ff534ea Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 23 Jan 2019 15:03:43 -0600 Subject: [PATCH 08/10] Add header text to forgot password --- src/components/structures/auth/ForgotPassword.js | 1 + src/i18n/strings/en_EN.json | 1 + 2 files changed, 2 insertions(+) diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js index 0a725808e0..8ce1a9b550 100644 --- a/src/components/structures/auth/ForgotPassword.js +++ b/src/components/structures/auth/ForgotPassword.js @@ -269,6 +269,7 @@ module.exports = React.createClass({ +

{ _t('Set a new password') }

{resetPasswordJsx} diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 3137313146..ccb45eac24 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1317,6 +1317,7 @@ "Confirm your new password": "Confirm your new password", "Send Reset Email": "Send Reset Email", "Sign in instead": "Sign in instead", + "Set a new password": "Set a new password", "Invalid homeserver discovery response": "Invalid homeserver discovery response", "Invalid identity server discovery response": "Invalid identity server discovery response", "General failure": "General failure", From f4bbfc4aebd4bd27cb08e14e528b3eaae0851a09 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 23 Jan 2019 15:26:39 -0600 Subject: [PATCH 09/10] Remove unneeded style from forgot password --- res/css/structures/auth/_Login.scss | 6 ------ src/components/structures/auth/ForgotPassword.js | 10 +++++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/res/css/structures/auth/_Login.scss b/res/css/structures/auth/_Login.scss index e3eadddae8..c32f70a696 100644 --- a/res/css/structures/auth/_Login.scss +++ b/res/css/structures/auth/_Login.scss @@ -69,12 +69,6 @@ limitations under the License. margin-right: 10px; } -.mx_Login_prompt { - padding-top: 15px; - padding-bottom: 15px; - font-size: 13px; -} - .mx_Login_sso_link { display: block; text-align: center; diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js index 8ce1a9b550..1e8376d91f 100644 --- a/src/components/structures/auth/ForgotPassword.js +++ b/src/components/structures/auth/ForgotPassword.js @@ -188,7 +188,7 @@ module.exports = React.createClass({ resetPasswordJsx = ; } else if (this.state.progress === "sent_email") { resetPasswordJsx = ( -
+
{ _t("An email has been sent to %(emailAddress)s. Once you've followed the link it contains, " + "click below.", { emailAddress: this.state.email }) }
@@ -198,14 +198,14 @@ module.exports = React.createClass({ ); } else if (this.state.progress === "complete") { resetPasswordJsx = ( -
+

{ _t('Your password has been reset') }.

{ _t('You have been logged out of all devices and will no longer receive push notifications. ' + 'To re-enable notifications, sign in again on each device') }.

- ); + ) } else { let serverConfigSection; if (!SdkConfig.get()['disable_custom_urls']) { @@ -229,9 +229,9 @@ module.exports = React.createClass({ resetPasswordJsx = (
-
+

{ _t('To reset your password, enter the email address linked to your account') }: -

+

Date: Wed, 23 Jan 2019 18:11:34 -0600 Subject: [PATCH 10/10] Fix linting error --- src/components/structures/auth/ForgotPassword.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js index 1e8376d91f..73d9f95e20 100644 --- a/src/components/structures/auth/ForgotPassword.js +++ b/src/components/structures/auth/ForgotPassword.js @@ -205,7 +205,7 @@ module.exports = React.createClass({
- ) + ); } else { let serverConfigSection; if (!SdkConfig.get()['disable_custom_urls']) {