Permalink
Browse files

portico: Add back to login page link on reset page.

This adds a link that goes back to the login page only for the
Zulip Electron application.

Fixes: #6763.
  • Loading branch information...
amanharitsh123 authored and timabbott committed Oct 1, 2017
1 parent 5b3bd49 commit 39c0771800f7c985b01f8e02516b0438eb3b1279
Showing with 20 additions and 3 deletions.
  1. +17 −3 static/styles/portico-signin.css
  2. +3 −0 templates/zerver/reset.html
@@ -621,12 +621,24 @@ button.login-google-button {
transform: translateX(15px) translateY(13px);
}
.login-page-container .right-side .actions {
.login-page-container .right-side .actions,
.forgot-password-container .actions {
margin: 20px 0px 0px;
text-align: left;
}
.split-view .actions a {
.forgot-password-container .actions {
line-height: 0;
}
.forgot-password-container .actions .back-to-login i {
position: relative;
top: 5px;
font-size: 0.8em;
}
.split-view .actions a,
.back-to-login {
color: hsl(164, 100%, 23%);
text-decoration: none;
font-weight: 600;
@@ -637,7 +649,9 @@ button.login-google-button {
transition: color 0.2s ease;
}
.split-view .actions a:hover {
.split-view .actions a:hover,
.back-to-login:hover {
text-decoration: none;
color: hsl(156, 62%, 61%);
}
@@ -32,6 +32,9 @@ <h1 class="get-started">{{ _('Reset your password') }}</h1>
</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>
</div>
</div>
</div>

0 comments on commit 39c0771

Please sign in to comment.