Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix heigh in reset password in FF

Browse source 
and fix navigation glitch when going back from reset or signup to #login (before that back links went to #/, leading to the sidebar blinking up because of the redirect delay – hardwired them to go back to #login [if there is a nother case to go back to it should be set via js]).
This commit is contained in:
Felix Niklas 2015-01-16 12:59:33 +01:00
parent 749dcdba30
commit c0c108dba6
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/views/password/reset.jst.eco
View file

@ -10,7 +10,7 @@
<form class="form-password"> <form class="form-password">
<div class="form-password-item"></div> <div class="form-password-item"></div>
<div class="form-controls"> <div class="form-controls">
<a class="subtle-link standalone pull-left cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a> <a class="subtle-link standalone pull-left cancel" href="#login"><%- @T( 'Cancel & Go Back' ) %></a>
<button class="btn btn--primary submit pull-right"><%- @T( 'Submit' ) %></button> <button class="btn btn--primary submit pull-right"><%- @T( 'Submit' ) %></button>
</div> </div>
</form> </form>

2
app/assets/javascripts/app/views/signup.jst.eco
View file

@ -4,7 +4,7 @@
<h1><%- @T( 'Join' ) %> <%= @C( 'product_name' ) %></h1> <h1><%- @T( 'Join' ) %> <%= @C( 'product_name' ) %></h1>
<form> <form>
<div class="form-controls"> <div class="form-controls">
<a class="subtle-link standalone pull-left" href="#/"><%- @T( 'Cancel & Go Back' ) %></a> <a class="subtle-link standalone pull-left" href="#login"><%- @T( 'Cancel & Go Back' ) %></a>
<button class="btn btn--primary submit pull-right"><%- @T( 'Create my account' ) %></button> <button class="btn btn--primary submit pull-right"><%- @T( 'Create my account' ) %></button>
</div> </div>
</form> </form>

3
app/assets/stylesheets/zammad.css.scss
View file

@ -993,6 +993,7 @@ textarea,
@extend .fit; @extend .fit;
display: table; display: table;
width: 100%; width: 100%;
height: 100%;
min-height: 100vh; min-height: 100vh;
} }
@ -4400,7 +4401,7 @@ footer {
} }
.scrollPageHeader { .scrollPageHeader {
// @extend .tabsSidebar-sidebarSpacer; @extend .tabsSidebar-sidebarSpacer;
@extend .zIndex-6; @extend .zIndex-6;
@extend .horizontal; @extend .horizontal;
@extend .center; @extend .center;