diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-08-18 17:10:26 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-08-18 17:10:26 +0200 |
| commit | 3cc0a4149f263a2a4ccc92673dfb9bcb1afb8bb9 (patch) | |
| tree | bcd131cf9b67f8410838cd74cd32f89cd63363f0 /phpBB | |
| parent | 09f547e373d9dedce138480d4cb883be7c6e2616 (diff) | |
| parent | 78f1e11aeb7e5a471b3a469c43f4cc548fd6ecbe (diff) | |
| download | forums-3cc0a4149f263a2a4ccc92673dfb9bcb1afb8bb9.tar forums-3cc0a4149f263a2a4ccc92673dfb9bcb1afb8bb9.tar.gz forums-3cc0a4149f263a2a4ccc92673dfb9bcb1afb8bb9.tar.bz2 forums-3cc0a4149f263a2a4ccc92673dfb9bcb1afb8bb9.tar.xz forums-3cc0a4149f263a2a4ccc92673dfb9bcb1afb8bb9.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11789] Remove inline color in memberlist_view
Conflicts:
phpBB/styles/subsilver2/template/memberlist_view.html
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/styles/subsilver2/template/memberlist_view.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/theme/stylesheet.css | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html index 3ffdb1ce70..06b5af3322 100644 --- a/phpBB/styles/subsilver2/template/memberlist_view.html +++ b/phpBB/styles/subsilver2/template/memberlist_view.html @@ -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> diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index b8c7ffb0ad..d2352d93ef 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -296,7 +296,7 @@ p.topicdetails { color: green; } -.offline, .error { +.offline, .error, .inactive { color: red; } |