Commit 27eaffe2 by Brittany Cheng

sort styles

parent 1f5aa5e6
...@@ -102,7 +102,7 @@ $discussion_input_width: 100%; ...@@ -102,7 +102,7 @@ $discussion_input_width: 100%;
font-size: $discussion_title_size; font-size: $discussion_title_size;
font-weight: bold; font-weight: bold;
margin-bottom: flex-gutter(6); margin-bottom: flex-gutter(6);
display: block; display: inline-block;
} }
.discussion-title-wrapper { .discussion-title-wrapper {
.discussion-watch-discussion, .discussion-unwatch-discussion { .discussion-watch-discussion, .discussion-unwatch-discussion {
...@@ -111,9 +111,6 @@ $discussion_input_width: 100%; ...@@ -111,9 +111,6 @@ $discussion_input_width: 100%;
margin-left: 5px; margin-left: 5px;
font-size: $comment_info_size; font-size: $comment_info_size;
} }
.discussion-title {
display: inline-block;
}
} }
.follow-wrapper { .follow-wrapper {
float: right; float: right;
...@@ -302,8 +299,8 @@ $discussion_input_width: 100%; ...@@ -302,8 +299,8 @@ $discussion_input_width: 100%;
@include discussion-font; @include discussion-font;
font-size: $comment_info_size; font-size: $comment_info_size;
font-style: italic; font-style: italic;
color: gray; color: gray;
.discussion-reply { .discussion-reply {
margin-left: 4px; margin-left: 4px;
} }
.discussion-link { .discussion-link {
...@@ -378,6 +375,7 @@ $discussion_input_width: 100%; ...@@ -378,6 +375,7 @@ $discussion_input_width: 100%;
} }
} }
//editor styles
.wmd-panel .wmd-panel
{ {
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
<label for="discussion-search-within-board-${discussion_id}" class="discussion-search-within-board">Search within board</label> <label for="discussion-search-within-board-${discussion_id}" class="discussion-search-within-board">Search within board</label>
</div> </div>
<div class="discussion-new-post control-button" href="javascript:void(0)">New Post</div> <div class="discussion-new-post control-button" href="javascript:void(0)">New Post</div>
<%include file="_sort.html" />
</div> </div>
<%include file="_sort.html" />
<div class="threads"> <div class="threads">
% for thread in threads: % for thread in threads:
${renderer.render_thread(course_id, thread, show_comments=False)} ${renderer.render_thread(course_id, thread, show_comments=False)}
......
...@@ -79,15 +79,19 @@ ...@@ -79,15 +79,19 @@
</%def> </%def>
<%def name="render_info(content)"> <%def name="render_info(content)">
${time_ago_in_words(parse(content['updated_at']))} ago by <div class="comment-time">
% if content['anonymous']: ${time_ago_in_words(parse(content['updated_at']))} ago by
anonymous % if content['anonymous']:
% else: anonymous
user No.${content['user_id']} % else:
% endif user No.${content['user_id']}
% if content.get('comments_count', -1) >= 0: % endif
, ${content['comments_count']} comment(s) </div>
% endif <div class="comment-count">
% if content.get('comments_count', -1) >= 0:
${content['comments_count']} comment(s)
% endif
</div>
</%def> </%def>
<%def name="render_link(cls, html)"> <%def name="render_link(cls, html)">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment