Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10023] Make password change notification more noticeable
This commit is contained in:
Joas Schilling 2013-12-16 10:25:45 +01:00
commit e3e34add7f
2 changed files with 2 additions and 2 deletions

View file

@ -7,7 +7,7 @@
<div class="inner">
<!-- IF S_FORCE_PASSWORD -->
<p>{L_FORCE_PASSWORD_EXPLAIN}</p>
<p class="error">{L_FORCE_PASSWORD_EXPLAIN}</p>
<!-- ENDIF -->
<fieldset>

View file

@ -6,7 +6,7 @@
</tr>
<!-- IF S_FORCE_PASSWORD -->
<tr>
<td class="row3" colspan="2" align="center"><span class="gensmall">{L_FORCE_PASSWORD_EXPLAIN}</span></td>
<td class="row3" colspan="2" align="center"><span class="gensmall error">{L_FORCE_PASSWORD_EXPLAIN}</span></td>
</tr>
<!-- ENDIF -->
<!-- IF ERROR -->