DNNCommunity#803 Fix for Boostrap Forum view Lines

Timo-Breumelhof · May 14, 2024 · fbdf91c · fbdf91c
1 parent 8f807bf
commit fbdf91c
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 62 deletions.
diff --git a/Dnn.CommunityForums/themes/community-bootstrap/_src/scss/parts/_bootstrap.scss b/Dnn.CommunityForums/themes/community-bootstrap/_src/scss/parts/_bootstrap.scss
@@ -1,8 +1,12 @@
 // Yes some of these could be done using Bootstrap classes, but are more efficient by overruling them
-
+// Bootstrap 4
 .table {
-    .dcf-th,
+
     tbody+tbody {
-        border-width: 1px !important;
+        border-width: 0 !important;
+    }
+
+    thead th{
+        border-bottom-width: 1px !important
     }
 }
diff --git a/Dnn.CommunityForums/themes/community-bootstrap/templates/ForumView.ascx b/Dnn.CommunityForums/themes/community-bootstrap/templates/ForumView.ascx
@@ -1,14 +1,14 @@
 <%@ Register TagPrefix="af" Assembly="DotNetNuke.Modules.ActiveForums" Namespace="DotNetNuke.Modules.ActiveForums.Controls"%>
-<div class="dcf-forum-view">
+	<div class="dcf-forum-view">
 [BREADCRUMB]
 [GROUPSECTION]
-<div class="dcf-forums">
-		<div class="dcf-group-title-wrap d-flex align-items-center py-2">
-			<h3 class="dcf-group-title h5 flex-grow-1">[RESX:Group]: [GROUPNAME]</h3>
-			<a class="bs-collapse" data-toggle="collapse" href="#forum-group-[FORUMGROUPID]" role="button" data-bs-toggle="collapse">
-				<i class="fa fa-chevron-circle-down fa-lg"></i>
-			</a>
-		</div>
+		<div class="dcf-forums">
+			<div class="dcf-group-title-wrap d-flex align-items-center py-2">
+				<h3 class="dcf-group-title h5 flex-grow-1">[RESX:Group]: [GROUPNAME]</h3>
+				<a class="bs-collapse" data-toggle="collapse" href="#forum-group-[FORUMGROUPID]" role="button" data-bs-toggle="collapse">
+					<i class="fa fa-chevron-circle-down fa-lg"></i>
+				</a>
+			</div>
 
 			[GROUP]
 			<div id="forum-group-[FORUMGROUPID]"  class="dcf-forums-group collapse show">
@@ -19,74 +19,86 @@
 								<div class="dcf-th-text">[RESX:FORUMHEADER]</div>
 							</th>
 							<th scope="col" class="dcf-th dcf-col-topics">
-								<div class="dcf-icon-text"><i class="fa fa-files-o"></i><span class="dcf-link-text">[RESX:TOPICSHEADER]</span></div>
+								<div class="dcf-icon-text">
+									<i class="fa fa-files-o"></i>
+									<span class="dcf-link-text">[RESX:TOPICSHEADER]</span>
+								</div>
 							</th>
 							<th scope="col" class="dcf-th dcf-col-replies">
-								<div class="dcf-icon-text"><i class="fa fa-reply"></i><span class="dcf-link-text">[RESX:REPLIESHEADER]</span></div>
+								<div class="dcf-icon-text">
+									<i class="fa fa-reply"></i>
+									<span class="dcf-link-text">[RESX:REPLIESHEADER]</span>
+								</div>
 							</th>
 							<th scope="col" class="dcf-th dcf-col-subscribers">
-								<div class="dcf-icon-text"><i class="fa fa-envelope-o"></i><span class="dcf-link-text">[RESX:SUBSCRIBERS]</span></div>
+								<div class="dcf-icon-text">
+									<i class="fa fa-envelope-o"></i>
+									<span class="dcf-link-text">[RESX:SUBSCRIBERS]</span>
+								</div>
 							</th>
 							<th scope="col" class="dcf-th dcf-col-last-post w-25">
-								<div class="dcf-icon-text"><i class="fa fa-file-o"></i><span class="dcf-link-text">[RESX:LASTPOSTHEADER]</span></div>
+								<div class="dcf-icon-text">
+									<i class="fa fa-file-o"></i>
+									<span class="dcf-link-text">[RESX:LASTPOSTHEADER]</span>
+								</div>
 							</th>
 						</tr>
 					</thead>
 					[FORUMS]
 					<tbody>
-					<tr class="dcf-table-body-row">
-
-						<td class="dcf-col dcf-col-text d-flex border-0">
-							[FORUMICONCSS]
-						<div class="dcf-forum-title-text">
-							<h4 class="dcf-forum-title h5 mt-0 mb-2">[FORUMNAME]</h4>
-							<div class="dcf-forum-description">[FORUMDESCRIPTION]</div>
-						</div>
-
-						</td>
-						<td class="dcf-col dcf-col-topics border-0">[TOTALTOPICS] </td>
-						<td class="dcf-col dcf-col-replies">[TOTALREPLIES]</td>
-						<td class="dcf-col dcf-col-subscribers">[FORUMSUBSCRIBERCOUNT]</td>
-						<td class="dcf-col dcf-col-last-post">
-							<span class="dcf-lastpost-subject">[LASTPOSTSUBJECT:25]</span>
-							<span class="dcf-lastpost-author">[RESX:BY] [DISPLAYNAME]</span>
-							<span class="dcf-lastpost-date">[LASTPOSTDATE]</span>
-						</td>
-					</tr>
+						<tr class="dcf-table-body-row">
+							<td class="dcf-col dcf-col-text">
+								<div class="d-flex">
+								[FORUMICONCSS]
+									<div class="dcf-forum-title-text">
+										<h4 class="dcf-forum-title h5 mt-0 mb-2">[FORUMNAME]</h4>
+										<div class="dcf-forum-description">[FORUMDESCRIPTION]</div>
+									</div>
+								</div>
+							</td>
+							<td class="dcf-col dcf-col-topics">[TOTALTOPICS] </td>
+							<td class="dcf-col dcf-col-replies">[TOTALREPLIES]</td>
+							<td class="dcf-col dcf-col-subscribers">[FORUMSUBSCRIBERCOUNT]</td>
+							<td class="dcf-col dcf-col-last-post">
+								<span class="dcf-lastpost-subject">[LASTPOSTSUBJECT:25]</span>
+								<span class="dcf-lastpost-author">[RESX:BY] [DISPLAYNAME]</span>
+								<span class="dcf-lastpost-date">[LASTPOSTDATE]</span>
+							</td>
+						</tr>
 
 					[SUBFORUMS]
-					<!-- <tr class="dcf-table-body-row dcf-sub-forums">
+						<!-- <tr class="dcf-table-body-row dcf-sub-forums">
 						<td class="dcf-col dcf-col-icon"></td>
 						<td class="dcf-col" colspan="5">
 							<h5 class="dcf-sub-forum-title">Child Forums</h5>
 						</td>
 					</tr> -->
-
-					<tr class="dcf-table-body-row dcf-sub-forums">
-
-
-									<td class="dcf-col dcf-col-icon"></td>
-									<td class="dcf-col dcf-col-text">
-												<span class="aftopictitle">[FORUMNAME]</span>
-												<span class="aftopicsubtitle">[FORUMDESCRIPTION]</span>
-									</td>
-									<td class="dcf-col dcf-col-topics">[TOTALTOPICS]</td>
-									<td class="dcf-col dcf-col-replies">[TOTALREPLIES]</td>
-									<td class="dcf-col dcf-col-subscribers">[FORUMSUBSCRIBERCOUNT]</td>
-									<td class="dcf-col dcf-col-last-post"><div class="af_lastpost" style="white-space:nowrap;">[LASTPOSTSUBJECT:25]<br />[RESX:BY] [DISPLAYNAME]<br />[LASTPOSTDATE]</div></td>
-								</tr>
+						<tr class="dcf-table-body-row dcf-sub-forums">
+							<td class="dcf-col dcf-col-icon"></td>
+							<td class="dcf-col dcf-col-text">
+								<span class="aftopictitle">[FORUMNAME]</span>
+								<span class="aftopicsubtitle">[FORUMDESCRIPTION]</span>
+							</td>
+							<td class="dcf-col dcf-col-topics">[TOTALTOPICS]</td>
+							<td class="dcf-col dcf-col-replies">[TOTALREPLIES]</td>
+							<td class="dcf-col dcf-col-subscribers">[FORUMSUBSCRIBERCOUNT]</td>
+							<td class="dcf-col dcf-col-last-post">
+								<div class="af_lastpost" style="white-space:nowrap;">[LASTPOSTSUBJECT:25]
+									<br />[RESX:BY] [DISPLAYNAME]
+									<br />[LASTPOSTDATE]
+								</div>
+							</td>
+						</tr>
 					[/SUBFORUMS]
-				</tbody>
+					</tbody>
 				[/FORUMS]
-			</table>
+				</table>
 			</div>
 		[/GROUP]
-
-
-</div>
+		</div>
 [/GROUPSECTION]
-<!-- Who's online -->
+		<!-- Who's online -->
 [WHOSONLINE]
-<!-- Jump To -->
-<div style="text-align:right;">[JUMPTO]</div>
-</div>
+		<!-- Jump To -->
+		<div style="text-align:right;">[JUMPTO]</div>
+	</div>
diff --git a/Dnn.CommunityForums/themes/community-bootstrap/theme-source.zip.resources b/Dnn.CommunityForums/themes/community-bootstrap/theme-source.zip.resources
diff --git a/Dnn.CommunityForums/themes/community-bootstrap/theme.css b/Dnn.CommunityForums/themes/community-bootstrap/theme.css
diff --git a/Dnn.CommunityForums/themes/community-bootstrap/theme.css.map b/Dnn.CommunityForums/themes/community-bootstrap/theme.css.map
diff --git a/Dnn.CommunityForums/themes/community-bootstrap/theme.min.css b/Dnn.CommunityForums/themes/community-bootstrap/theme.min.css