Merge branch '3.3.x'

This commit is contained in:
Máté Bartus 2021-07-13 18:48:39 +02:00
commit 460ed2ff31
4 changed files with 8 additions and 8 deletions

View file

@ -45,7 +45,7 @@
</tr> </tr>
<!-- BEGINELSE --> <!-- BEGINELSE -->
<tr> <tr>
<td colspan="6" style="text-align: center;">{L_NO_INACTIVE_USERS}</td> <td colspan="7" style="text-align: center;">{L_NO_INACTIVE_USERS}</td>
</tr> </tr>
<!-- END inactive --> <!-- END inactive -->
</tbody> </tbody>

View file

@ -96,10 +96,10 @@
<thead> <thead>
<tr> <tr>
<th>{L_STYLE_NAME}</th> <th>{L_STYLE_NAME}</th>
<th width="10%" style="white-space: nowrap; text-align: center;">{{ lang('STYLE_VERSION') }}</th> <th style="width: 10%; white-space: nowrap; text-align: center;">{{ lang('STYLE_VERSION') }}</th>
<th width="10%" style="white-space: nowrap; text-align: center;">{L_STYLE_PHPBB_VERSION}</th> <th style="width: 10%; white-space: nowrap; text-align: center;">{L_STYLE_PHPBB_VERSION}</th>
<!-- IF not STYLES_LIST_HIDE_COUNT --><th width="10%" style="white-space: nowrap; text-align: center;">{L_STYLE_USED_BY}</th><!-- ENDIF --> <!-- IF not STYLES_LIST_HIDE_COUNT --><th style="width: 10%; white-space: nowrap; text-align: center;">{L_STYLE_USED_BY}</th><!-- ENDIF -->
<th width="25%" style="white-space: nowrap; text-align: center;">{L_ACTIONS}</th> <th style="width: 25%; white-space: nowrap; text-align: center;">{L_ACTIONS}</th>
{STYLES_LIST_EXTRA} {STYLES_LIST_EXTRA}
<th>&nbsp;</th> <th>&nbsp;</th>
</tr> </tr>
@ -146,7 +146,7 @@
<!-- END actions --> <!-- END actions -->
</td> </td>
{styles_list.EXTRA} {styles_list.EXTRA}
<td class="{$ROW_CLASS} mark" width="20"> <td class="{$ROW_CLASS} mark" style="width: 20px;">
<!-- IF styles_list.STYLE_ID --> <!-- IF styles_list.STYLE_ID -->
{% if styles_list.STYLE_NAME !== 'prosilver' %} {% if styles_list.STYLE_NAME !== 'prosilver' %}
<input class="checkbox" type="checkbox" name="ids[]" value="{styles_list.STYLE_ID}" /> <input class="checkbox" type="checkbox" name="ids[]" value="{styles_list.STYLE_ID}" />

View file

@ -31,7 +31,7 @@
<div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}"> <div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}">
<a href="#" class="alert_close"></a> <a href="#" class="alert_close"></a>
<h3 class="alert_title"></h3><p class="alert_text"></p> <h3 class="alert_title">&nbsp;</h3><p class="alert_text"></p>
</div> </div>
<div id="phpbb_confirm" class="phpbb_alert"> <div id="phpbb_confirm" class="phpbb_alert">
<a href="#" class="alert_close"></a> <a href="#" class="alert_close"></a>

View file

@ -31,7 +31,7 @@
<a href="#" class="alert_close"> <a href="#" class="alert_close">
{{ Icon('iconify', 'fa:times-circle', '', true) }} {{ Icon('iconify', 'fa:times-circle', '', true) }}
</a> </a>
<h3 class="alert_title"></h3><p class="alert_text"></p> <h3 class="alert_title">&nbsp;</h3><p class="alert_text"></p>
</div> </div>
<div id="phpbb_confirm" class="phpbb_confirm phpbb_alert"> <div id="phpbb_confirm" class="phpbb_confirm phpbb_alert">
<a href="#" class="alert_close"> <a href="#" class="alert_close">