From 95e5f9cfe0bfa2506e865f64287a6cde047689df Mon Sep 17 00:00:00 2001
From: Michael Miday <midaym@gmail.com>
Date: Wed, 30 Aug 2017 17:41:33 -0400
Subject: [PATCH 1/2] [ticket/15343] Fix forum row inner list

PHPBB3-15343
---
 .../styles/prosilver/template/forumlist_body.html  | 14 +++++++++-----
 phpBB/styles/prosilver/theme/content.css           | 12 ++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 621e226260..143c143542 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -44,17 +44,21 @@
 						<!-- ENDIF -->
 						<!-- IF forumrow.FORUM_IMAGE --><span class="forum-image">{forumrow.FORUM_IMAGE}</span><!-- ENDIF -->
 						<a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a>
-						<!-- IF forumrow.FORUM_DESC --><br />{forumrow.FORUM_DESC}<!-- ENDIF -->
+						<!-- IF forumrow.FORUM_DESC --><span class="forum-desc">{forumrow.FORUM_DESC}</span><!-- ENDIF -->
 						<!-- IF forumrow.MODERATORS -->
-							<br /><strong>{forumrow.L_MODERATOR_STR}{L_COLON}</strong> {forumrow.MODERATORS}
+							<span class="forum-mods"><strong>{forumrow.L_MODERATOR_STR}{L_COLON}</strong> {forumrow.MODERATORS}</span>
 						<!-- ENDIF -->
 						<!-- IF .forumrow.subforum and forumrow.S_LIST_SUBFORUMS -->
 							<!-- EVENT forumlist_body_subforums_before -->
-							<br /><strong>{forumrow.L_SUBFORUM_STR}{L_COLON}</strong>
+							<span class="forum-subs">
+								<strong>{forumrow.L_SUBFORUM_STR}{L_COLON}</strong>
 							<!-- BEGIN subforum -->
-								<!-- EVENT forumlist_body_subforum_link_prepend --><a href="{forumrow.subforum.U_SUBFORUM}" class="subforum<!-- IF forumrow.subforum.S_UNREAD --> unread<!-- ELSE --> read<!-- ENDIF -->" title="<!-- IF forumrow.subforum.S_UNREAD -->{L_UNREAD_POSTS}<!-- ELSE -->{L_NO_UNREAD_POSTS}<!-- ENDIF -->">
-									<i class="icon <!-- IF forumrow.subforum.IS_LINK -->fa-external-link<!-- ELSE -->fa-file-o<!-- ENDIF --> fa-fw <!-- IF forumrow.subforum.S_UNREAD --> icon-red<!-- ELSE --> icon-blue<!-- ENDIF --> icon-md" aria-hidden="true"></i>{forumrow.subforum.SUBFORUM_NAME}</a><!-- IF not forumrow.subforum.S_LAST_ROW -->{L_COMMA_SEPARATOR}<!-- ENDIF --><!-- EVENT forumlist_body_subforum_link_append -->
+								<!-- EVENT forumlist_body_subforum_link_prepend -->
+								<a href="{forumrow.subforum.U_SUBFORUM}" class="subforum<!-- IF forumrow.subforum.S_UNREAD --> unread<!-- ELSE --> read<!-- ENDIF -->" title="<!-- IF forumrow.subforum.S_UNREAD -->{L_UNREAD_POSTS}<!-- ELSE -->{L_NO_UNREAD_POSTS}<!-- ENDIF -->">
+									<i class="icon <!-- IF forumrow.subforum.IS_LINK -->fa-external-link<!-- ELSE -->fa-file-o<!-- ENDIF --> fa-fw <!-- IF forumrow.subforum.S_UNREAD --> icon-red<!-- ELSE --> icon-blue<!-- ENDIF --> icon-md" aria-hidden="true"></i>{forumrow.subforum.SUBFORUM_NAME}</a><!-- IF not forumrow.subforum.S_LAST_ROW -->{L_COMMA_SEPARATOR}<!-- ENDIF -->
+								<!-- EVENT forumlist_body_subforum_link_append -->
 							<!-- END subforum -->
+							</span>
 							<!-- EVENT forumlist_body_subforums_after -->
 						<!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index d4c8ea730b..360c3985eb 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -88,6 +88,18 @@ ul.topiclist dfn {
 	padding-top: 5px;
 }
 
+.forum-desc {
+	display: none;
+}
+
+.forum-mods {
+	display: none;
+}
+
+.forum-subs {
+	display: none;
+}
+
 li.row {
 	border-top: 1px solid transparent;
 	border-bottom: 1px solid transparent;

From 40b2e3c1d48e1fd7af2254b78155e36e6885beab Mon Sep 17 00:00:00 2001
From: Michael Miday <midaym@gmail.com>
Date: Fri, 1 Sep 2017 06:30:44 -0400
Subject: [PATCH 2/2] [ticket/15343] make blocks

PHPBB3-15343
---
 phpBB/styles/prosilver/theme/content.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index 360c3985eb..19d7130ff6 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -89,15 +89,15 @@ ul.topiclist dfn {
 }
 
 .forum-desc {
-	display: none;
+	display: block;
 }
 
 .forum-mods {
-	display: none;
+	display: block;
 }
 
 .forum-subs {
-	display: none;
+	display: block;
 }
 
 li.row {