diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-03 09:46:39 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-03 09:46:39 +0100 |
| commit | ddc16d8642b92972b9bfb7d47d2a0f415fd326bf (patch) | |
| tree | 5a29e291a75dd1b33299b2269850dc9e16ac6fca /webclient | |
| parent | Add ban support: /rooms/$roomid/ban with { user_id : foo } (diff) | |
| parent | Add database upgrade script (diff) | |
| download | synapse-ddc16d8642b92972b9bfb7d47d2a0f415fd326bf.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'webclient')
| -rw-r--r-- | webclient/login/register.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webclient/login/register.html b/webclient/login/register.html index 1b470e4554..81995f1ae0 100644 --- a/webclient/login/register.html +++ b/webclient/login/register.html @@ -12,8 +12,8 @@ <div style="text-align: center"> <br/> - <input id="email" size="32" type="text" ng-focus="true" ng-model="account.email" placeholder="Email address (optional)"/> - <div class="smallPrint">Specifying an email address lets other users find you on Matrix more easily,<br/> + <input id="email" size="32" type="text" ng-focus="true" ng-model="account.email" placeholder="Email address (optional)" style="display: none"/> + <div class="smallPrint" style="display: none;">Specifying an email address lets other users find you on Matrix more easily,<br/> and gives you a way to reset your password</div> <input id="desired_user_id" size="32" type="text" ng-model="account.desired_user_id" placeholder="Matrix ID (e.g. bob)"/> <br/> |