Skip to content

Commit a4444fb

Browse files
authored
Merge pull request #44 from topcoder-platform/issues-554
Issues-554: Challenge Forums page
2 parents 5c004b4 + 66685e0 commit a4444fb

File tree

9 files changed

+87
-23
lines changed

9 files changed

+87
-23
lines changed

design/custom.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

design/custom.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/custom.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/custom.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/js/discussions.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,11 @@ $( document ).ready(function() {
88
$(this).prepend(originalMeta.clone().addClass('tag-container hide-desktop'));
99
originalMeta.addClass('status-container');
1010
});
11+
12+
$( "ul.DataList.GroupList li.Item .ItemContent.Group" ).each(function( index ) {
13+
var originalMeta = $( this ).find('.Meta.Meta-Group');
14+
$(this).append(originalMeta.clone().addClass('view-comment-container hide-desktop'));
15+
//$(this).prepend(originalMeta.clone().addClass('tag-container hide-desktop'));
16+
originalMeta.addClass('status-container');
17+
});
1118
})

src/js/groups.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
"use strict"
2+
$( document ).ready(function() {
3+
$( "ul.DataList.GroupList li.Item .ItemContent.Group" ).each(function( index ) {
4+
var originalMeta = $( this ).find('.Meta.Meta-Group');
5+
$(this).append(originalMeta.clone().addClass('view-comment-container hide-desktop'));
6+
originalMeta.addClass('status-container');
7+
});
8+
})

src/js/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import "../../node_modules/@vanillaforums/theme-boilerplate/src/js/index";
88
import "./header";
99
import "./body";
1010
import "./discussions";
11+
import "./groups";
1112
import "./pageControls";
1213
import "./categories";
1314
import "./formsFields";

src/scss/base/_messageList.scss

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@
100100
}
101101
}
102102

103-
104-
105103
.CategoryAccordion {
106104
.CategoryAccordionItem {
107105
margin-bottom: 20px;
@@ -188,18 +186,29 @@
188186
}
189187
}
190188
}
191-
}
189+
.DataList.GroupList {
190+
li.Item {
191+
.Title {
192+
margin-bottom: 0px;
193+
}
192194

193-
.DataList.GroupList {
194-
li.Item {
195-
.Description {
196-
font-family: $global-body_fontFamily;
197-
color: $global-color_grey;
198-
font-size: 13px;
195+
.Description {
196+
color: $global-color_grey;
197+
}
198+
199+
.Description, .Description a {
200+
font-family: $global-body_fontFamily;
201+
font-size: 13px;
202+
}
203+
204+
.GroupLastDiscussionComment {
205+
margin-top: 18px;
206+
}
199207
}
200208
}
201209
}
202210

211+
203212
.MessageList.Discussion {
204213
.Item.ItemDiscussion {
205214
.Item-BodyWrap {

src/scss/pages/_groups.scss

Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616
text-align: left;
1717
}
1818

19-
@media screen and (max-width: 768px) {
20-
.Section-GroupList .DataList .Item .Options {
21-
margin-top: 0px;
22-
}
23-
}
24-
2519
.Group-MembersPreview {
2620
.PhotoWrap.PhotoWrap.PhotoWrap img {
2721
margin: 0;
@@ -42,4 +36,49 @@ Group-Header.HasBanner {
4236
.Group-Header-Info {
4337
margin: 20px;
4438
}
39+
}
40+
41+
@media screen and (max-width: 768px) {
42+
.Section-GroupList .DataList .Item .Options {
43+
margin-top: 0px;
44+
}
45+
46+
.DataList.GroupList {
47+
li.Item {
48+
49+
.Meta.Meta-Group {
50+
51+
&.status-container {
52+
.MCount,
53+
.Tag, .MiddleDot {
54+
display: none;
55+
}
56+
}
57+
58+
&.view-comment-container {
59+
margin-top: 0px;
60+
float: right;
61+
62+
.MItem:not(.MCount,.MiddleDot),
63+
.Tag {
64+
display: none;
65+
}
66+
67+
.MCount {
68+
position: relative;
69+
70+
&::after {
71+
content: none;
72+
}
73+
74+
&.CommentCount {
75+
&::after {
76+
content: none;
77+
}
78+
}
79+
}
80+
}
81+
}
82+
}
83+
}
4584
}

0 commit comments

Comments
 (0)