Skip to content

Commit 5bbc452

Browse files
WillStrohlWillStrohl
authored
Merge pull request #1323 from Timo-Breumelhof/feature/1322-icon-align-bs4
FIX: Icon align in Bootstrap 4
2 parents e413e83 + 117f52e commit 5bbc452

File tree

8 files changed

+140
-117
lines changed

8 files changed

+140
-117
lines changed

‎Dnn.CommunityForums/themes/community-bootstrap/templates/ForumView.ascx

+5-6
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<tr class="dcf-table-body-row">
4949
<td class="dcf-col dcf-col-text">
5050
<div class="d-flex">
51-
[FORUM:FORUMICONCSS|<div class="dcf-forum-icon pe-2"><i class="fa {0} fa-2x"></i></div>
51+
[FORUM:FORUMICONCSS|<div class="dcf-forum-icon pr-2 pe-2"><i class="fa {0} fa-2x"></i></div>
5252
]
5353
<div class="dcf-forum-title-text">
5454
<h4 class="dcf-forum-title h5 mt-0 mb-2">[FORUM:FORUMLINK|
@@ -78,15 +78,14 @@
7878
</tr>
7979

8080
[SUBFORUMS]
81-
<tr class="dcf-table-body-row dcf-sub-forums">
82-
<td class="dcf-col dcf-col-icon"></td>
83-
<td class="dcf-col" colspan="5">
84-
<h5 class="dcf-sub-forum-title">[RESX:Child] [RESX:FORUMS]</h5>
81+
<tr class="dcf-table-body-row dcf-sub-forums">
82+
<td class="dcf-col pl-5 px-5" colspan="5">
83+
<h5 class="dcf-sub-forum-title h6 my-1">[RESX:Child] [RESX:FORUMS]</h5>
8584
</td>
8685
</tr>
8786
<tr class="dcf-table-body-row dcf-sub-forums">
8887

89-
<td class="dcf-col dcf-col-text">
88+
<td class="dcf-col dcf-col-text pl-5 ps-5">
9089
<span class="dcf-forum-title h6">[FORUM:FORUMLINK|
9190
<a href="{0}" class="dcf-forum-link">[FORUM:FORUMNAME]</a>
9291
]</span>

‎Dnn.CommunityForums/themes/community-bootstrap/theme-source.zip.resources

-1.17 KB
Binary file not shown.

‎Dnn.CommunityForums/themes/community-default/_src/less/parts/_forum-view.less

+16-14
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,32 @@
33
// Forum groups
44
.dcf-forums-group {
55

6-
margin-bottom: @dist-md;
6+
margin-bottom: @dist-lg;
77
padding: @dist-md 0;
88

9-
109
.dcf-forum-title {
1110
margin: 0;
1211
font-size: @title-2-size;
1312
}
1413

15-
// Align fourm icon with title and text
16-
.dcf-main-forums{
14+
// Align fourm icon with title and text
15+
.dcf-main-forums {
16+
17+
.dcf-col-text-inner {
18+
display: flex;
1719

18-
.dcf-col-text-inner{
19-
display: flex;
20-
21-
}
20+
}
2221

23-
}
22+
}
2423

25-
.dcf-col-last-post{
26-
white-space: nowrap;
27-
}
24+
.dcf-col-last-post {
25+
white-space: nowrap;
26+
}
2827

2928

3029
// Sub Forums
3130
.dcf-sub-forums {
31+
3232
.dcf-col-icon {
3333
border: none;
3434
}
@@ -38,11 +38,13 @@
3838
font-size: @title-3-size;
3939
margin: 0;
4040
color: @title-color;
41+
padding-left: @dist-lg;
4142
}
4243

43-
44+
.dcf-col-text {
45+
padding-left: @dist-xl;
46+
}
4447
}
4548

4649
}
4750
}
48-

‎Dnn.CommunityForums/themes/community-default/templates/ForumView.ascx

+112-94
Original file line numberDiff line numberDiff line change
@@ -1,120 +1,138 @@
11
<%@ Register TagPrefix="af" Assembly="DotNetNuke.Modules.ActiveForums" Namespace="DotNetNuke.Modules.ActiveForums.Controls"%>
2-
<div class="dcf-forum-view">
2+
<div class="dcf-forum-view">
33
[BREADCRUMB]
44
[GROUPSECTION]
5-
<div class="dcf-forums">
6-
<div class="dcf-group-title-wrap">
7-
<h3 class="dcf-group-title">[RESX:Group]: [FORUMGROUP:GROUPLINK|<a href="{0}" class="dcf-forumgroup-link">[FORUMGROUP:GROUPNAME]</a>]</h3>
8-
<span class="dcf-group-collapse">[FORUMGROUP:GROUPCOLLAPSE]</span>
9-
</div>
5+
<div class="dcf-forums">
6+
<div class="dcf-group-title-wrap">
7+
<h3 class="dcf-group-title">[RESX:Group]: [FORUMGROUP:GROUPLINK|
8+
<a href="{0}" class="dcf-forumgroup-link">[FORUMGROUP:GROUPNAME]</a>]
9+
</h3>
10+
<span class="dcf-group-collapse">[FORUMGROUP:GROUPCOLLAPSE]</span>
11+
</div>
1012

1113
[GROUP]
12-
<div class="dcf-forums-group">
13-
<table class="dcf-table dcf-table-100">
14-
<thead>
15-
<tr class="dcf-table-head-row">
16-
<th scope="col" class="dcf-th dcf-col-text">
17-
<div class="dcf-th-text">[RESX:FORUMHEADER]</div>
18-
</th>
19-
<th scope="col" class="dcf-th dcf-col-topics">
20-
<div class="dcf-icon-text"><i class="fa fa-files-o"></i><span class="dcf-link-text">[RESX:TOPICSHEADER]</span></div>
21-
</th>
22-
<th scope="col" class="dcf-th dcf-col-replies">
23-
<div class="dcf-icon-text"><i class="fa fa-reply"></i><span class="dcf-link-text">[RESX:REPLIESHEADER]</span></div>
24-
</th>
25-
<th scope="col" class="dcf-th dcf-col-subscribers">
26-
<div class="dcf-icon-text"><i class="fa fa-envelope-o"></i><span class="dcf-link-text">[RESX:SUBSCRIBERS]</span></div>
27-
</th>
28-
<th scope="col" class="dcf-th dcf-col-last-post">
29-
<div class="dcf-icon-text"><i class="fa fa-file-o"></i><span class="dcf-link-text">[RESX:LASTPOSTHEADER]</span></div>
30-
</th>
31-
</tr>
32-
</thead>
14+
<div class="dcf-forums-group">
15+
<table class="dcf-table dcf-table-100">
16+
<thead>
17+
<tr class="dcf-table-head-row">
18+
<th scope="col" class="dcf-th dcf-col-text">
19+
<div class="dcf-th-text">[RESX:FORUMHEADER]</div>
20+
</th>
21+
<th scope="col" class="dcf-th dcf-col-topics">
22+
<div class="dcf-icon-text">
23+
<i class="fa fa-files-o"></i>
24+
<span class="dcf-link-text">[RESX:TOPICSHEADER]</span>
25+
</div>
26+
</th>
27+
<th scope="col" class="dcf-th dcf-col-replies">
28+
<div class="dcf-icon-text">
29+
<i class="fa fa-reply"></i>
30+
<span class="dcf-link-text">[RESX:REPLIESHEADER]</span>
31+
</div>
32+
</th>
33+
<th scope="col" class="dcf-th dcf-col-subscribers">
34+
<div class="dcf-icon-text">
35+
<i class="fa fa-envelope-o"></i>
36+
<span class="dcf-link-text">[RESX:SUBSCRIBERS]</span>
37+
</div>
38+
</th>
39+
<th scope="col" class="dcf-th dcf-col-last-post">
40+
<div class="dcf-icon-text">
41+
<i class="fa fa-file-o"></i>
42+
<span class="dcf-link-text">[RESX:LASTPOSTHEADER]</span>
43+
</div>
44+
</th>
45+
</tr>
46+
</thead>
3347
[FORUMS]
34-
35-
36-
<tbody>
37-
<tr class="dcf-table-body-row dcf-main-forums">
38-
<td class="dcf-col dcf-col-text">
39-
<div class="dcf-col-text-inner">
40-
[FORUM:FORUMICONCSS|<div class="dcf-forum-icon" style="height: 30px; margin-right: 10px;"><i class="fa {0} fa-2x"></i></div>
48+
<tbody>
49+
<tr class="dcf-table-body-row dcf-main-forums">
50+
<td class="dcf-col dcf-col-text">
51+
<div class="dcf-col-text-inner">
52+
[FORUM:FORUMICONCSS|
53+
<div class="dcf-forum-icon" style="height: 30px; margin-right: 10px;">
54+
<i class="fa {0} fa-2x"></i>
55+
</div>
4156
]
42-
43-
<div class="dcf-forum-title-text">
44-
<h4 class="dcf-forum-title">
57+
<div class="dcf-forum-title-text">
58+
<h4 class="dcf-forum-title">
4559
[FORUM:FORUMLINK|
46-
<a href="{0}" class="dcf-forum-link">[FORUM:FORUMNAME]</a>
60+
<a href="{0}" class="dcf-forum-link">[FORUM:FORUMNAME]</a>
4761
]
48-
</h4>
49-
<div class="dcf-forum-description">[FORUM:FORUMDESCRIPTION]</div>
50-
</div>
51-
</div>
52-
</td>
53-
<td class="dcf-col dcf-col-topics">[FORUM:TOTALTOPICS]</td>
54-
<td class="dcf-col dcf-col-replies">[FORUM:TOTALREPLIES]</td>
55-
<td class="dcf-col dcf-col-subscribers">[FORUM:SUBSCRIBERCOUNT]</td>
56-
<td class="dcf-col dcf-col-last-post">
57-
<div class="dcf-last-post">
62+
</h4>
63+
<div class="dcf-forum-description">[FORUM:FORUMDESCRIPTION]</div>
64+
</div>
65+
</div>
66+
</td>
67+
<td class="dcf-col dcf-col-topics">[FORUM:TOTALTOPICS]</td>
68+
<td class="dcf-col dcf-col-replies">[FORUM:TOTALREPLIES]</td>
69+
<td class="dcf-col dcf-col-subscribers">[FORUM:SUBSCRIBERCOUNT]</td>
70+
<td class="dcf-col dcf-col-last-post">
71+
<div class="dcf-last-post">
5872
[FORUM:LASTPOSTSUBJECT:25]
59-
<div class="dcf-last-profile">
73+
<div class="dcf-last-profile">
6074
[FORUM:LASTPOSTAUTHORDISPLAYNAMELINK|
61-
[RESX:BY] <i class="fa fa-user fa-fw fa-blue"></i>&nbsp;<a href="{0}" class="dcf-profile-link" rel="nofollow">[FORUM:LASTPOSTAUTHORDISPLAYNAME]</a>|
62-
[RESX:BY] <i class="fa fa-user fa-fw fa-blue"></i>[FORUM:LASTPOSTAUTHORDISPLAYNAME]
75+
[RESX:BY]
76+
<i class="fa fa-user fa-fw fa-blue"></i>&nbsp;
77+
<a href="{0}" class="dcf-profile-link" rel="nofollow">[FORUM:LASTPOSTAUTHORDISPLAYNAME]</a>|
78+
[RESX:BY]
79+
<i class="fa fa-user fa-fw fa-blue"></i>[FORUM:LASTPOSTAUTHORDISPLAYNAME]
6380
]
64-
</div>
65-
<div class="dcf-last-date">
81+
</div>
82+
<div class="dcf-last-date">
6683
[FORUM:LASTPOSTDATE]
6784
</div>
68-
</div>
69-
</td>
70-
</tr>
85+
</div>
86+
</td>
87+
</tr>
7188

7289
[SUBFORUMS]
73-
<tr class="dcf-table-body-row dcf-sub-forums">
74-
<td class="dcf-col dcf-col-icon"></td>
75-
<td class="dcf-col" colspan="5">
76-
<h5 class="dcf-sub-forum-title">[RESX:Child] [RESX:FORUMS]</h5>
77-
</td>
78-
</tr>
79-
80-
<tr class="dcf-table-body-row dcf-sub-forums">
81-
82-
<td class="dcf-col dcf-col-icon"></td>
83-
<td class="dcf-col dcf-col-text">
84-
<span class="aftopictitle">[FORUM:FORUMLINK|<a href="{0}" class="dcf-forum-link">[FORUM:FORUMNAME]</a>]</span>
85-
<span class="aftopictitle">([RESX:Child] [RESX:of] [FORUM:PARENTFORUMNAME])</span>
86-
<span class="aftopicsubtitle">[FORUM:FORUMDESCRIPTION]</span>
87-
</td>
88-
<td class="dcf-col dcf-col-topics">[FORUM:TOTALTOPICS]</td>
89-
<td class="dcf-col dcf-col-replies">[FORUM:TOTALREPLIES]</td>
90-
<td class="dcf-col dcf-col-subscribers">[FORUM:SUBSCRIBERCOUNT]</td>
91-
<td class="dcf-col dcf-col-last-post">
92-
<div class="dcf-last-post">
90+
<tr class="dcf-table-body-row dcf-sub-forums">
91+
<td class="dcf-col" colspan="5">
92+
<h5 class="dcf-sub-forum-title">
93+
<i class="fa fa-code-fork"></i> [RESX:Child] [RESX:FORUMS]
94+
</h5>
95+
</td>
96+
</tr>
97+
<tr class="dcf-table-body-row dcf-sub-forums">
98+
<td class="dcf-col dcf-col-text">
99+
<span class="aftopictitle">[FORUM:FORUMLINK|
100+
<a href="{0}" class="dcf-forum-link">[FORUM:FORUMNAME]</a>]
101+
</span>
102+
<span class="aftopictitle">([RESX:Child] [RESX:of] [FORUM:PARENTFORUMNAME])</span>
103+
<span class="aftopicsubtitle">[FORUM:FORUMDESCRIPTION]</span>
104+
</td>
105+
<td class="dcf-col dcf-col-topics">[FORUM:TOTALTOPICS]</td>
106+
<td class="dcf-col dcf-col-replies">[FORUM:TOTALREPLIES]</td>
107+
<td class="dcf-col dcf-col-subscribers">[FORUM:SUBSCRIBERCOUNT]</td>
108+
<td class="dcf-col dcf-col-last-post">
109+
<div class="dcf-last-post">
93110
[FORUM:LASTPOSTSUBJECT:25]
94-
<div class="dcf-last-profile">
111+
<div class="dcf-last-profile">
95112
[FORUM:LASTPOSTAUTHORDISPLAYNAMELINK|
96-
[RESX:BY] <i class="fa fa-user fa-fw fa-blue"></i>&nbsp;<a href="{0}" class="dcf-profile-link" rel="nofollow">[FORUM:LASTPOSTAUTHORDISPLAYNAME]</a>|
97-
[RESX:BY] <i class="fa fa-user fa-fw fa-blue"></i>[FORUM:LASTPOSTAUTHORDISPLAYNAME]
113+
[RESX:BY]
114+
<i class="fa fa-user fa-fw fa-blue"></i>&nbsp;
115+
<a href="{0}" class="dcf-profile-link" rel="nofollow">[FORUM:LASTPOSTAUTHORDISPLAYNAME]</a>|
116+
[RESX:BY]
117+
<i class="fa fa-user fa-fw fa-blue"></i>[FORUM:LASTPOSTAUTHORDISPLAYNAME]
98118
]
99-
</div>
100-
<div class="dcf-last-date">
119+
</div>
120+
<div class="dcf-last-date">
101121
[FORUM:LASTPOSTDATE]
102122
</div>
103-
</div>
104-
</td>
105-
</tr>
123+
</div>
124+
</td>
125+
</tr>
106126
[/SUBFORUMS]
107-
</tbody>
127+
</tbody>
108128
[/FORUMS]
109-
</table>
110-
</div>
129+
</table>
130+
</div>
111131
[/GROUP]
112-
113-
114-
</div>
132+
</div>
115133
[/GROUPSECTION]
116-
<!-- Who's online -->
134+
<!-- Who's online -->
117135
[WHOSONLINE]
118-
<!-- Jump To -->
119-
<div style="text-align:right;">[JUMPTO]</div>
120-
</div>
136+
<!-- Jump To -->
137+
<div style="text-align:right;">[JUMPTO]</div>
138+
</div>

‎Dnn.CommunityForums/themes/community-default/theme-source.zip.resources

-7 Bytes
Binary file not shown.

‎Dnn.CommunityForums/themes/community-default/theme.css

+5-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Dnn.CommunityForums/themes/community-default/theme.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Dnn.CommunityForums/themes/community-default/theme.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)