Merge pull request #768 from Timo-Breumelhof/feature/764-theme-improv…

…ements Fixes for #764
DNNCommunity · Apr 23, 2024 · ba7d573 · ba7d573
2 parents 014836a + b9dcd1c
commit ba7d573
Show file tree

Hide file tree

Showing 8 changed files with 89 additions and 61 deletions.
diff --git a/Dnn.CommunityForums/themes/community-bootstrap/templates/ForumView.ascx b/Dnn.CommunityForums/themes/community-bootstrap/templates/ForumView.ascx
@@ -36,11 +36,13 @@
 					<tbody>
 					<tr class="dcf-table-body-row">
 
-						<td class="dcf-col dcf-col-text d-flex border-0">
+						<td class="dcf-col dcf-col-text border-0">
+						<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 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>

diff --git a/Dnn.CommunityForums/themes/community-default/_src/less/parts/_forum-view.less b/Dnn.CommunityForums/themes/community-default/_src/less/parts/_forum-view.less
@@ -7,24 +7,25 @@
   		padding: @dist-md 0;
 
 
-
-
-
-
-
   		.dcf-forum-title {
   			margin: 0;
   			font-size: @title-2-size;
   		}
 
-  		.dcf-lastpost-subject {
-  			display: block;
-  		}
-
-
+		// Align fourm icon with title and text
+		  .dcf-main-forums{
 
+				.dcf-col-text-inner{
+					display: flex;
+
+				}
 
+		  }
+
 
+  		.dcf-lastpost-subject {
+  			display: block;
+  		}
 
 
   		// Sub Forums
@@ -42,4 +43,5 @@
   		}
 
   	}
-  }
+  }
+
diff --git a/Dnn.CommunityForums/themes/community-default/_src/less/parts/_table.less b/Dnn.CommunityForums/themes/community-default/_src/less/parts/_table.less
@@ -32,57 +32,64 @@
         }
     }
 
-      		// Table header
-              .dcf-table-body-row {
-
-                // TH width 
-                .dcf-col-number,
-                .dcf-col-replies,
-                .dcf-col-views,
-                .dcf-col-ratings,
-                .dcf-col-status,
-                .dcf-col-subscribers {
-                    text-align: center;
-                    width: 0; // Shrink them..
-                }
-
-                .dcf-col-icon{
-
-                    width: 0;
-                }
-
-            }
+    // Table header
+    .dcf-table-body-row {
+
+        // TH width 
+        .dcf-col-number,
+        .dcf-col-replies,
+        .dcf-col-views,
+        .dcf-col-ratings,
+        .dcf-col-status,
+        .dcf-col-subscribers {
+            text-align: center;
+            width: 0; // Shrink them..
+        }
+
+        .dcf-col-icon {
+
+            width: 0;
+        }
 
-
-  		// Icon with text
-  		.dcf-icon-text {
-            white-space: nowrap;
+        .dcf-col-text, .dcf-col-subject{
+            width: 80%;
 
-            .dcf-link-text {
-                margin-left: 0.3em;
+            @media screen and(min-width: @break-tablet){
+                width: 60%;
             }
         }
 
+    }
+
+    // Icon with text
+    .dcf-icon-text {
+        white-space: nowrap;
+
+        .dcf-link-text {
+            margin-left: 0.3em;
+        }
+    }
+
 
-        // Forum Description
-        .dcf-forum-description {
-            display: block;
-            padding-top: 1em;
-            font-size: 0.9em;
+    // Forum Description
+    .dcf-forum-description {
+        display: block;
+        padding-top: 1em;
+        font-size: 0.9em;
 
-            .fa {
-                display: none; // Hide description icon
+        .fa {
+            display: none; // Hide description icon
 
-            }
+        }
 
-            &:empty{
-                padding-top: 0;
-            }
+        &:empty {
+            padding-top: 0;
         }
+    }
 
 
     // Forum Icon Column
-        .dcf-col-icon {
+    .dcf-col-icon {
         font-size: 0.7em; // Overrrule fa-2x
 
         >div {
@@ -96,7 +103,7 @@
         }
     }
 
-    .dcf-topic-started{
+    .dcf-topic-started {
         padding: @dist-sm 0;
     }
 

diff --git a/Dnn.CommunityForums/themes/community-default/templates/ForumView.ascx b/Dnn.CommunityForums/themes/community-default/templates/ForumView.ascx
@@ -13,7 +13,7 @@
 				<table class="dcf-table dcf-table-100">
 					<thead>
 						<tr class="dcf-table-head-row">
-							<th scope="col" colspan="2" class="dcf-th dcf-col-text">
+							<th scope="col" class="dcf-th dcf-col-text">
 								<div class="dcf-th-text">[RESX:FORUMHEADER]</div>
 							</th>
 							<th scope="col" class="dcf-th dcf-col-topics">
@@ -32,11 +32,15 @@
 					</thead>
 					[FORUMS]
 					<tbody>
-					<tr class="dcf-table-body-row">
-						<td class="dcf-col dcf-col-icon">[FORUMICONCSS]</td>
+					<tr class="dcf-table-body-row dcf-main-forums">
+
 						<td class="dcf-col dcf-col-text">
-							<h4 class="dcf-forum-title">[FORUMNAME]</h4>
-							<span class="dcf-forum-description">[FORUMDESCRIPTION]</span>
+							<div class="dcf-col-text-inner">
+								[FORUMICONCSS]
+								<div class="dcf-forum-title-text"><h4 class="dcf-forum-title">[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>

diff --git a/Dnn.CommunityForums/themes/community-default/theme-source.zip.resources b/Dnn.CommunityForums/themes/community-default/theme-source.zip.resources
diff --git a/Dnn.CommunityForums/themes/community-default/theme.css b/Dnn.CommunityForums/themes/community-default/theme.css
diff --git a/Dnn.CommunityForums/themes/community-default/theme.css.map b/Dnn.CommunityForums/themes/community-default/theme.css.map
diff --git a/Dnn.CommunityForums/themes/community-default/theme.min.css b/Dnn.CommunityForums/themes/community-default/theme.min.css