paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

portico: Add return to login button to password reset end.

Browse Source 
Previously, we had a "Return to login" button on the previous page of
the password reset flow, but none on the final page.

Note that this button is only shown in the Zulip Electron app.

Fixes #13378.
This commit is contained in:
Ivan Mitev
2019-11-14 01:28:06 +02:00
committed by Tim Abbott
parent 8ed57f8897
commit 0f582dfe1f
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
static/styles/portico/portico-signin.scss
View File

@@ -633,16 +633,16 @@ button.login-social-button:active {
}
.login-page-container .right-side .actions,
.forgot-password-container .actions {
.back-to-login-wrapper {
margin: 20px 0px 0px;
text-align: left;
}
.forgot-password-container .actions {
.back-to-login-wrapper {
line-height: 0;
}
.forgot-password-container .actions .back-to-login i {
.back-to-login-wrapper .back-to-login i {
position: relative;
top: 5px;

3
templates/zerver/include/back_to_login_component.html Normal file
View File

@@ -0,0 +1,3 @@
<div class="back-to-login-wrapper if-zulip-electron"><!-- only show if on `ZulipElectron` -->
<a class="back-to-login" href="{{login_url}}"><i class="fa fa-arrow-left"></i> Back to the login page</a>
</div>

4
templates/zerver/reset.html
View File

@@ -31,9 +31,7 @@
</div>
</div>
</form>
<div class="actions if-zulip-electron"><!-- only show if on `ZulipElectron` -->
<a class="back-to-login" href="{{login_url}}"><i class="fa fa-arrow-left"></i> Back to the login page</a>
</div>
{% include 'zerver/include/back_to_login_component.html' %}
</div>
</div>
</div>

1
templates/zerver/reset_emailed.html
View File

@@ -12,6 +12,7 @@
<div class="white-box">
<p>{{ _('Check your email in a few minutes to finish the process.') }}</p>
{% include 'zerver/dev_env_email_access_details.html' %}
{% include 'zerver/include/back_to_login_component.html' %}
</div>
</div>
</div>