Skip to content

Commit

Permalink
Retain space after fadeOut by using show() on DOM element.
Browse files Browse the repository at this point in the history
fadeOut uses display: none always!

Assign nextStep links the .submit class.

fixes #3617
  • Loading branch information
halfdan committed Feb 4, 2013
1 parent bfed9c6 commit 141a2df
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
14 changes: 4 additions & 10 deletions plugins/Installation/templates/install.css
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,7 @@ li.pastStep {
}

p.nextStep a {
font-weight: bold;
padding: 0.5em;
color: #ae0000;
text-decoration: underline;
float:right;
font-size:35px;
line-height:1em;
text-decoration: none;
}

td {
Expand All @@ -162,7 +156,7 @@ td {
text-align:center;
cursor: pointer;
}
.submit input{
.submit input {
margin-top:15px;
background:transparent url(./themes/default/images/background-submit.png) repeat scroll 0;
font-size:1.4em;
Expand All @@ -173,7 +167,7 @@ td {
padding:0.15em;
}

input {
input {
font-size:18px;
border-color:#CCCCCC rgb(153, 153, 153) rgb(153, 153, 153) rgb(204, 204, 204);
border-width:1px;
Expand All @@ -195,4 +189,4 @@ input {
padding-right:10px;
vertical-align:middle;
}
.err { color:red;font-weight:bold;}
.err { color:red;font-weight:bold;}
6 changes: 3 additions & 3 deletions plugins/Installation/templates/structure.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{literal}
<script type="text/javascript">
$(document).ready( function(){
$('#toFade').fadeOut(4000, function(){ $(this).css('display', 'hidden'); } );
$('#toFade').fadeOut(4000, function(){ $(this).show().css({visibility:'hidden'}); } );
$('input:first').focus();
$('#progressbar').progressbar({
{/literal}
Expand Down Expand Up @@ -51,13 +51,13 @@ $(document).ready( function(){
<div id="detailInstall">
{if isset($showNextStepAtTop) && $showNextStepAtTop}
<p class="nextStep">
<a href="{url action=$nextModuleName}">{'General_Next'|translate} &raquo;</a>
<a class="submit" href="{url action=$nextModuleName}">{'General_Next'|translate} &raquo;</a>
</p>
{/if}
{include file="$subTemplateToLoad"}
{if $showNextStep}
<p class="nextStep">
<a href="{url action=$nextModuleName}">{'General_Next'|translate} &raquo;</a>
<a class="submit" href="{url action=$nextModuleName}">{'General_Next'|translate} &raquo;</a>
</p>
{/if}
</div>
Expand Down

0 comments on commit 141a2df

Please sign in to comment.