diff --git a/lms/static/coffee/src/discussion/templates.coffee b/lms/static/coffee/src/discussion/templates.coffee index 2e85ba71f3..882b42abaa 100644 --- a/lms/static/coffee/src/discussion/templates.coffee +++ b/lms/static/coffee/src/discussion/templates.coffee @@ -11,7 +11,7 @@ Discussion = @Discussion
diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss index 59b84e1f7d..746c08517d 100644 --- a/lms/static/sass/_discussion.scss +++ b/lms/static/sass/_discussion.scss @@ -45,6 +45,9 @@ form label { margin-left: 5px; } } + .blank { + margin: 2%; + } //SORTING .discussion-sort { float: right; @@ -213,11 +216,17 @@ form label { display: block; margin-left: -5%; } + .new-post-similar-posts-wrapper { + font-size: $comment_body_size; + line-height: 150%; + padding: 1%; + } .new-post-similar-posts { + font: inherit; .similar-post { display: block; + line-height: 150%; } - } .new-post-body { margin-top: flex-gutter(); @@ -243,6 +252,10 @@ form label { } .discussion-content-edit, .discussion-reply-new, .new-post-form { margin: 10px 0 10px 0; + a:hover { + color: #1C71DD; + text-decoration: none; + }; .new-post-control { margin-left: 80%; margin-top: 1%; @@ -265,6 +278,9 @@ form label { padding-top: 9px; text-decoration: none; width: inherit; + &:hover { + color: white; + } } } .new-post-form { @@ -326,6 +342,12 @@ form label { font-size: $comment_info_size; font-style: italic; margin-top: 2%; + a { + &:hover { + text-decoration: none; + color: #1C71DD; + } + } .comment-time { display: inline; float: right; @@ -342,6 +364,10 @@ form label { color: #1d9dd9; display: inline; margin-left: 2px; + &:hover { + text-decoration: none; + color: #1C71DD; + } } } .discussion-content { diff --git a/lms/templates/discussion/_blank_slate.html b/lms/templates/discussion/_blank_slate.html index e08a45cc70..b8c8f58dda 100644 --- a/lms/templates/discussion/_blank_slate.html +++ b/lms/templates/discussion/_blank_slate.html @@ -1,7 +1,7 @@
% if performed_search: - There is no result matching your search parameters. + Sorry! We can't find anything matching your search. Please try another search. % else: - There is no post here yet. Be the first one to post! + There are no posts here yet. Be the first one to post! % endif
diff --git a/lms/templates/discussion/_forum.html b/lms/templates/discussion/_forum.html index b7d72b631c..cff3b6c1f9 100644 --- a/lms/templates/discussion/_forum.html +++ b/lms/templates/discussion/_forum.html @@ -14,18 +14,20 @@
New Post
- <%include file="_sort.html" /> % if len(threads) == 0: - <%include file="_blank_slate.html" /> +
+ <%include file="_blank_slate.html" /> +
% else: + <%include file="_sort.html" />
% for thread in threads: ${renderer.render_thread(course_id, thread, show_comments=False)} % endfor
+ <%include file="_paginator.html" /> % endif - <%include file="_paginator.html" /> <%! diff --git a/lms/templates/discussion/_inline.html b/lms/templates/discussion/_inline.html index 362523f7fc..306df5c0af 100644 --- a/lms/templates/discussion/_inline.html +++ b/lms/templates/discussion/_inline.html @@ -6,19 +6,21 @@ <%include file="_search_bar.html" />
New Post
- <%include file="_sort.html" /> % if len(threads) == 0: - <%include file="_blank_slate.html" /> +
+ <%include file="_blank_slate.html" /> +
% else: + <%include file="_sort.html" />
% for thread in threads: ${renderer.render_thread(course_id, thread, show_comments=False)} % endfor
+ <%include file="_paginator.html" /> % endif - <%include file="_paginator.html" /> <%!