paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Fixes: #6763.
This commit is contained in:
amanharitsh123
2017-10-01 16:37:53 +05:30
committed by Tim Abbott
parent 5b3bd49061
commit 39c0771800
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
static/styles/portico-signin.css
View File

@@ -621,12 +621,24 @@ button.login-google-button {
transform: translateX(15px) translateY(13px); 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; margin: 20px 0px 0px;
text-align: left; 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%); color: hsl(164, 100%, 23%);
text-decoration: none; text-decoration: none;
font-weight: 600; font-weight: 600;
@@ -637,7 +649,9 @@ button.login-google-button {
transition: color 0.2s ease; 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%); color: hsl(156, 62%, 61%);
} }

3
templates/zerver/reset.html
View File

@@ -32,6 +32,9 @@
</div> </div>
</div> </div>
</form> </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> </div>
</div> </div>