makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/11789] Remove inline color in memberlist_view

Conflicts:
	phpBB/styles/subsilver2/template/memberlist_view.html
This commit is contained in:
Andreas Fischer 2013-08-18 17:10:26 +02:00
commit 3cc0a4149f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/styles/subsilver2/template/memberlist_view.html
View file

@ -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>

2
phpBB/styles/subsilver2/theme/stylesheet.css
View file

@ -296,7 +296,7 @@ p.topicdetails {
color: green;
}
.offline, .error {
.offline, .error, .inactive {
color: red;
}