diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-12-21 22:52:28 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-12-21 22:52:28 +0100 |
| commit | 34a1b044a17ececdaa2d4df541f985c34b83b1ce (patch) | |
| tree | 49cf115747161ff0e6bbb002dcc71fe27ba191f7 | |
| parent | 442fc61be77787c211650f21b2fb485f5e6ffcf0 (diff) | |
| parent | c298c9d6d0021931d08a3a189711117730b25278 (diff) | |
| download | forums-34a1b044a17ececdaa2d4df541f985c34b83b1ce.tar forums-34a1b044a17ececdaa2d4df541f985c34b83b1ce.tar.gz forums-34a1b044a17ececdaa2d4df541f985c34b83b1ce.tar.bz2 forums-34a1b044a17ececdaa2d4df541f985c34b83b1ce.tar.xz forums-34a1b044a17ececdaa2d4df541f985c34b83b1ce.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9937] Make sure feed icon only shows for FORUM_POST
[ticket/9937] The feed icon displays on External links...which we don't want
[ticket/9925] prosilver logo margin bug in IE 6-7-8
| -rw-r--r-- | phpBB/includes/functions_display.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/tweaks.css | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 71aee5d8e3..eb64a115c6 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -457,7 +457,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod 'S_LOCKED_FORUM' => ($row['forum_status'] == ITEM_LOCKED) ? true : false, 'S_LIST_SUBFORUMS' => ($row['display_subforum_list']) ? true : false, 'S_SUBFORUMS' => (sizeof($subforums_list)) ? true : false, - 'S_FEED_ENABLED' => ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $row['forum_options'])) ? true : false, + 'S_FEED_ENABLED' => ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $row['forum_options']) && $row['forum_type'] == FORUM_POST) ? true : false, 'FORUM_ID' => $row['forum_id'], 'FORUM_NAME' => $row['forum_name'], diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css index 782e682b9d..30fe5fb986 100644 --- a/phpBB/styles/prosilver/theme/tweaks.css +++ b/phpBB/styles/prosilver/theme/tweaks.css @@ -90,3 +90,12 @@ dl.icon { * html .forumbg table.table1 { margin: 0 -2px 0px -1px; } + +/* Headerbar height fix for IE7 and below */ +* html #site-description p { + margin-bottom: 1.0em; +} + +*:first-child+html #site-description p { + margin-bottom: 1.0em; +}
\ No newline at end of file |