diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-06-17 16:33:48 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-06-17 16:33:48 +0200 |
| commit | 478f8052ffe6fde7deec4148b885bc0369d45c5e (patch) | |
| tree | 2f50fdfbc86f1c763b6f1022f5fdbe64907fab9f /phpBB | |
| parent | fe690779d4439071194ee3d047363ccd5fff4538 (diff) | |
| parent | 9975d24b9d3f82df30751016eff92a2cfc528d33 (diff) | |
| download | forums-478f8052ffe6fde7deec4148b885bc0369d45c5e.tar forums-478f8052ffe6fde7deec4148b885bc0369d45c5e.tar.gz forums-478f8052ffe6fde7deec4148b885bc0369d45c5e.tar.bz2 forums-478f8052ffe6fde7deec4148b885bc0369d45c5e.tar.xz forums-478f8052ffe6fde7deec4148b885bc0369d45c5e.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[feature/dbal-tests] Follow the coding guidelines and ...
[feature/dbal-tests] Update data
[feature/dbal-tests] Multi insert
[feature/dbal-tests] Delete data
[feature/dbal-tests] Insert data
[feature/dbal-tests] Fix SQL-ERROR: invalid input syntax for integer: ""
[ticket/9587] Prosilver overrides reCaptcha class.
[ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/styles/prosilver/template/viewforum_body.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/forms.css | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index cc38ed9d2b..1c9ec7bc4a 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -122,7 +122,7 @@ <!-- ENDIF --> <!-- IF topicrow.S_FIRST_ROW or not topicrow.S_TOPIC_TYPE_SWITCH --> - <div class="forumbg<!-- IF topicrow.S_TOPIC_TYPE_SWITCH --> announcement<!-- ENDIF -->"> + <div class="forumbg<!-- IF topicrow.S_TOPIC_TYPE_SWITCH and topicrow.S_TOPIC_TYPE gt 1 --> announcement<!-- ENDIF -->"> <div class="inner"><span class="corners-top"><span></span></span> <ul class="topiclist"> <li class="header"> diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css index 4db342661c..4516c7fcd2 100644 --- a/phpBB/styles/prosilver/theme/forms.css +++ b/phpBB/styles/prosilver/theme/forms.css @@ -96,6 +96,11 @@ fieldset.fields1 div { margin-bottom: 3px; } +/* Set it back to 0px for the reCaptcha divs: PHPBB3-9587 */ +fieldset.fields1 #recaptcha_widget_div div { + margin-bottom: 0px; +} + /* Specific layout 2 */ fieldset.fields2 dt { width: 15em; |