Commit d5302a0b by Tom Giannattasio

thread updates: follow/unfollow, grid tweaks

parent 00a72cf8
...@@ -170,38 +170,16 @@ $tag_text_color: #5b614f; ...@@ -170,38 +170,16 @@ $tag_text_color: #5b614f;
box-shadow: inset 0 1px 0 #BBB,0 0 3px #CCC; box-shadow: inset 0 1px 0 #BBB,0 0 3px #CCC;
} }
} }
//FOLLOW BUTTON //FOLLOW BUTTON
.follow-wrapper { .follow-wrapper {
float: right; display: inline;
.discussion-link {
@include button;
background-color: #BEBEBE;
background-image: none;
border: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
display: inline-block;
font-size: $comment_info_size;
padding: 5px 8px;
text-decoration: none;
text-shadow: none;
&:hover {
background-color: #AAA;
background-image: none;
border: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
}
} }
//VOTES //VOTES
.discussion-votes { .discussion-votes {
float: left; float: left;
width: flex-grid(1); width: 60px;
margin-top: 18px; margin-top: 18px;
text-align: center; text-align: center;
...@@ -263,10 +241,9 @@ $tag_text_color: #5b614f; ...@@ -263,10 +241,9 @@ $tag_text_color: #5b614f;
} }
//CREATE NEW AND EDIT POSTS //CREATE NEW AND EDIT POSTS
.discussion-right-wrapper { .discussion-right-wrapper {
float: left;
min-height: 40px; min-height: 40px;
width: flex-grid(11); // width: flex-grid(11);
margin: 24px 0; margin: 24px 0 24px 68px;
} }
.new-post-form, .discussion-thread-edit { .new-post-form, .discussion-thread-edit {
...@@ -415,6 +392,7 @@ $tag_text_color: #5b614f; ...@@ -415,6 +392,7 @@ $tag_text_color: #5b614f;
.comment-count { .comment-count {
display: inline; display: inline;
margin-right: 20px;
} }
.discussion-actions { .discussion-actions {
...@@ -424,19 +402,18 @@ $tag_text_color: #5b614f; ...@@ -424,19 +402,18 @@ $tag_text_color: #5b614f;
li { li {
display: inline; display: inline;
margin-left: 20px; margin-right: 20px;
} }
} }
.discussion-reply {
margin-left: 4px;
}
.discussion-link { .discussion-link {
@include discussion-font; @include discussion-font;
color: #1d9dd9; color: #1d9dd9;
display: inline; display: inline;
margin-left: 2px;
&.discussion-unfollow-thread {
color: #dea03e;
}
} }
} }
...@@ -463,11 +440,16 @@ $tag_text_color: #5b614f; ...@@ -463,11 +440,16 @@ $tag_text_color: #5b614f;
.comments { .comments {
//display: none; //display: none;
// margin-left: $comment_margin_left; // margin-left: $comment_margin_left;
margin-left: flex-grid(1); // margin-left: flex-grid(1);
margin-left: 68px;
overflow: hidden; overflow: hidden;
.discussion-votes {
margin-top: 8px;
}
.discussion-right-wrapper { .discussion-right-wrapper {
margin: 10px 0; margin: 10px 0 10px 68px;
} }
.comment { .comment {
......
...@@ -39,8 +39,7 @@ ...@@ -39,8 +39,7 @@
${render_vote(content)} ${render_vote(content)}
<div class="discussion-right-wrapper clearfix"> <div class="discussion-right-wrapper clearfix">
<div class="follow-wrapper">
</div>
${render_title(content, type, **kwargs)} ${render_title(content, type, **kwargs)}
<div class="discussion-content-view"> <div class="discussion-content-view">
<div class="content-body ${type}-body" id="content-body-${content['id']}">${content['body'] | h}</div> <div class="content-body ${type}-body" id="content-body-${content['id']}">${content['body'] | h}</div>
...@@ -79,6 +78,7 @@ ...@@ -79,6 +78,7 @@
${render_info(content)} ${render_info(content)}
<ul class="discussion-actions"> <ul class="discussion-actions">
<li>${render_link("discussion-link discussion-reply discussion-reply-" + type, "Reply")}</li> <li>${render_link("discussion-link discussion-reply discussion-reply-" + type, "Reply")}</li>
<li><div class="follow-wrapper"></div></li>
<li>${render_link("discussion-link discussion-edit", "Edit")}</li> <li>${render_link("discussion-link discussion-edit", "Edit")}</li>
<li> <li>
% if type == "comment" and request.user.is_staff: % if type == "comment" and request.user.is_staff:
...@@ -105,7 +105,13 @@ ...@@ -105,7 +105,13 @@
</div> </div>
<div class="comment-count"> <div class="comment-count">
% if content.get('comments_count', -1) >= 0: % if content.get('comments_count', -1) >= 0:
<a href="javascript:void(0)" class="discussion-show-comments"> Show ${content['comments_count']} comment(s)</a> <a href="javascript:void(0)" class="discussion-show-comments">
% if content.get('comments_count', -1) >= 2:
Show ${content['comments_count']} comments
% else:
Show ${content['comments_count']} comment
% endif
</a>
% endif % endif
</div> </div>
</%def> </%def>
......
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