PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1126 from matrix-org/luke/redesign-user-settings-pwd-warn

Browse source 
Redesign the warning to be red text, move below "Sign out"
This commit is contained in:
Luke Barnard 2017-06-20 15:23:47 +01:00 committed by GitHub
commit a547e9c200
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/components/structures/UserSettings.js
View file

@ -1214,15 +1214,14 @@ module.exports = React.createClass({
<h3>{ _t("Account") }</h3> <h3>{ _t("Account") }</h3>
<div className="mx_UserSettings_section cadcampoHide"> <div className="mx_UserSettings_section cadcampoHide">
{ this.state.userHasGeneratedPassword ?
<div className="mx_UserSettings_passwordWarning">
<img className="mx_UserSettings_passwordWarning_icon" src="img/warning.svg" width="24" height="23" alt="Warning"/>
{ _t("To return to your account in future you need to set a password") }
</div> : null
}
<AccessibleButton className="mx_UserSettings_logout mx_UserSettings_button" onClick={this.onLogoutClicked}> <AccessibleButton className="mx_UserSettings_logout mx_UserSettings_button" onClick={this.onLogoutClicked}>
{ _t("Sign out") } { _t("Sign out") }
</AccessibleButton> </AccessibleButton>
{ this.state.userHasGeneratedPassword ?
<div className="mx_UserSettings_passwordWarning">
{ _t("To return to your account in future you need to set a password") }
</div> : null
}
{accountJsx} {accountJsx}
</div> </div>