Skip to content

Commit

Permalink
Merge pull request #1204 from Timo-Breumelhof/features/1116-Filtered-…
Browse files Browse the repository at this point in the history
…topics-cleanup

ENH: Basic cleanup for Search results and Filtered Topics
  • Loading branch information
johnhenley authored Dec 18, 2024
2 parents cd1cba1 + e6cd7be commit 813e6b0
Show file tree
Hide file tree
Showing 8 changed files with 79 additions and 207 deletions.
91 changes: 1 addition & 90 deletions Dnn.CommunityForums/config/templates/SearchResults.ascx
Original file line number Diff line number Diff line change
@@ -1,97 +1,8 @@
<style>
div.afgrid {
width: 100%;
display: table;
font-size: 14px;
font-weight: 300;
color: #333;
}
div.aftopicrow {
width: 100%;
display: table-row;
}
div.aftopicrow div.afsubject {
width: 60%;
display: table-cell;
}
div.af-colstats {
display: table-cell;
width: 10%;
}
div.af-lastpost {
display: table-cell;
width: 20%;
white-space: nowrap;
font-weight: 400;
color: #888;
}
div.af-lastpost div {
text-align: left;
overflow: hidden;
white-space: normal !important;
}
div.af-lastpost div a:link,
div.af-lastpost div a:visited {
text-decoration: none;
font-size: 12px;
font-weight: 700;
color: #333;
word-break: break-word;
}
.aftopictitle,
.aftopictitle a {
font-size: 15px;
/*display: block;*/
font-weight: 700;
color: #333 !important;
letter-spacing: -0.5px;
line-height: 1.25;
}
div.af-content div.afsubject {
vertical-align: top;
padding-right: 10px;
}
div.af-content div.afsubject > a {
color: #333;
font-weight: 700;
font-size: 13px;
}
div.af-content div.afsubject .aftopicstarted a {
color: #333;
font-weight: 700;
font-size: 14px;
display: inline-block;
margin-top: 4px;
margin-bottom: 4px;
}
.aftopicstarted {
display: block !important;
color: #888;
font-size: 14px;
}
.aftopicsubtitle {
display: inline-block;
font-size: 15px;
font-weight: 400;
display: block;
color: #888;
word-break: break-word;
overflow: hidden;
}
</style>
<div class="dcf-search-results-wrap">
<div class="af-search-header">

<am:pagernav id="PagerTop" runat="server" />
<h1 class="af-search-title">[RESX:Search]</h1>
<h2 class="af-search-title">[RESX:Search]</h2>
<br />
<button class="af-search-modify">[RESX:SearchModify]</button>
<br />
Expand Down
93 changes: 2 additions & 91 deletions Dnn.CommunityForums/config/templates/TopicResults.ascx
Original file line number Diff line number Diff line change
@@ -1,97 +1,8 @@
<style>
div.afgrid {
width: 100%;
display: table;
font-size: 14px;
font-weight: 300;
color: #333;
}
div.aftopicrow {
width: 100%;
display: table-row;
}
div.aftopicrow div.afsubject {
width: 60%;
display: table-cell;
}
div.af-colstats {
display: table-cell;
width: 10%;
}
div.af-lastpost {
display: table-cell;
width: 20%;
white-space: nowrap;
font-weight: 400;
color: #888;
}
div.af-lastpost div {
text-align: left;
overflow: hidden;
white-space: normal !important;
}
div.af-lastpost div a:link,
div.af-lastpost div a:visited {
text-decoration: none;
font-size: 12px;
font-weight: 700;
color: #333;
word-break: break-word;
}
.aftopictitle,
.aftopictitle a {
font-size: 15px;
/*display: block;*/
font-weight: 700;
color: #333 !important;
letter-spacing: -0.5px;
line-height: 1.25;
}
div.af-content div.afsubject {
vertical-align: top;
padding-right: 10px;
}
div.af-content div.afsubject > a {
color: #333;
font-weight: 700;
font-size: 13px;
}
div.af-content div.afsubject .aftopicstarted a {
color: #333;
font-weight: 700;
font-size: 14px;
display: inline-block;
margin-top: 4px;
margin-bottom: 4px;
}
.aftopicstarted {
display: block !important;
color: #888;
font-size: 14px;
}
.aftopicsubtitle {
display: inline-block;
font-size: 15px;
font-weight: 400;
display: block;
color: #888;
word-break: break-word;
overflow: hidden;
}
</style>
<div class="dcf-search-results-wrap">
<div class="af-search-header">
<am:pagernav id="PagerTop" runat="server" />
<h1 class="af-search-title">
<asp:Label ID="lblHeader" runat="server" /></h1>
<h2 class="af-search-title">
<asp:Label ID="lblHeader" runat="server" /></h2>
<button type="submit" runat="server" id="btnMarkRead" class="af-markread" visible="false" onclick="if(!af_confirmMarkAllRead()) return false;" />
<asp:DropDownList ID="drpTimeFrame" runat="server" AutoPostBack="true" Visible="false">
<asp:ListItem Value="15"></asp:ListItem>
Expand Down
68 changes: 68 additions & 0 deletions Dnn.CommunityForums/module.css
Original file line number Diff line number Diff line change
Expand Up @@ -1622,3 +1622,71 @@ div.dcf-mod-edit-wrap {
.dnn-community-forums .dcf-likes-tooltip .dcf-likes-tooltiptext::after { content: ""; position: absolute; top: 100%; left: 50%; margin-left: -5px; border-width: 5px; border-style: solid; border-color: #555 transparent transparent transparent; }
.dnn-community-forums .dcf-likes-tooltip:hover .dcf-likes-tooltiptext { visibility: visible; opacity: 1; }
.dnn-community-forums .dcf-likes-tooltip .dcf-likes-tooltiptext a { cursor: pointer; }


/* Search results : needs cleaning for V9, see #1116 */
.dcf-search-results-wrap .afgrid {
width: 100%;
display: table;
}
.dcf-search-results-wrap .aftopicrow {
width: 100%;
display: table-row;
border-bottom: solid 1px #eee;
padding: 0.5em;
}
.dcf-search-results-wrap .aftopicrow .afsubject {
width: 60%;
display: table-cell;
}
.dcf-search-results-wrap .af-colstats {
display: table-cell;
width: 10%;
}
.dcf-search-results-wrap .af-lastpost {
display: table-cell;
width: 20%;
white-space: nowrap;
font-weight: 400;
}
.dcf-search-results-wrap .af-lastpost div {
text-align: left;
overflow: hidden;
white-space: normal !important;
}
.dcf-search-results-wrap .af-lastpost div a:link, .dcf-search-results-wrap .af-lastpost div a:visited {
text-decoration: none;
font-weight: 700;
color: #333;
}
.dcf-search-results-wrap .aftopictitle, .dcf-search-results-wrap .aftopictitle a {
/*display: block;
*/
font-weight: 700;
line-height: 1.25;
}
.dcf-search-results-wrap.af-content .afsubject {
vertical-align: top;
padding-right: 10px;
}
.dcf-search-results-wrap .af-content div.afsubject > a {
color: #333;
font-weight: 700;
}
.dcf-search-results-wrap .af-content div.afsubject .aftopicstarted a {
color: #333;
font-weight: 700;
display: inline-block;
margin-top: 4px;
margin-bottom: 4px;
}
.dcf-search-results-wrap .aftopicstarted {
display: block;
}
.dcf-search-results-wrap .aftopicsubtitle {
font-weight: 400;
display: block;
word-break: break-word;
overflow: hidden;
}

Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,9 @@
}
}

.af-search-results{

.afgrid{
.aftopicrow{
vertical-align:top;
padding: @dist-md @dist-sm;
border-bottom: @separator-border;

.aftopictitle{

display:block;
padding-bottom: @dist-sm;
}
}
}

.dcf-search-results-wrap{

.af-search-title{
margin-top: 1rem;
}
}
Binary file not shown.
10 changes: 2 additions & 8 deletions Dnn.CommunityForums/themes/community-default/theme.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Dnn.CommunityForums/themes/community-default/theme.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Dnn.CommunityForums/themes/community-default/theme.min.css

Large diffs are not rendered by default.

0 comments on commit 813e6b0

Please sign in to comment.