mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/11789] Remove inline color in memberlist_view Conflicts: phpBB/styles/subsilver2/template/memberlist_view.html
This commit is contained in:
@@ -18,7 +18,7 @@
|
||||
<table cellspacing="1" cellpadding="2" border="0">
|
||||
<!-- IF S_USER_INACTIVE -->
|
||||
<tr>
|
||||
<td align="center" style="color: red;"><b class="gen">{L_USER_IS_INACTIVE}</b><br />{L_INACTIVE_REASON}{L_COLON} {USER_INACTIVE_REASON}<br /><br /></td>
|
||||
<td align="center"><b class="gen inactive">{L_USER_IS_INACTIVE}</b><br />{L_INACTIVE_REASON}{L_COLON} {USER_INACTIVE_REASON}<br /><br /></td>
|
||||
</tr>
|
||||
<!-- ENDIF -->
|
||||
<tr>
|
||||
|
@@ -296,7 +296,7 @@ p.topicdetails {
|
||||
color: green;
|
||||
}
|
||||
|
||||
.offline, .error {
|
||||
.offline, .error, .inactive {
|
||||
color: red;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user