diff --git a/lms/static/coffee/src/discussion.coffee b/lms/static/coffee/src/discussion.coffee index 78190b6b12..e2645bcd8e 100644 --- a/lms/static/coffee/src/discussion.coffee +++ b/lms/static/coffee/src/discussion.coffee @@ -326,7 +326,7 @@ Discussion = interactive: true defaultText: "Tag your post: press enter after each tag" height: "30px" - width: "90%" + width: "100%" removeWithBackspace: true $local(".discussion-submit-update").unbind("click").click -> handleSubmitEditThread(this) $local(".discussion-cancel-update").unbind("click").click -> handleCancelEdit(this) @@ -509,7 +509,7 @@ Discussion = interactive: true defaultText: "Tag your post: press enter after each tag" height: "30px" - width: "90%" + width: "100%" removeWithBackspace: true $local(".discussion-submit-post").click -> handleSubmitNewPost(this) diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss index 7b90a33cc9..8384b19002 100644 --- a/lms/static/sass/_discussion.scss +++ b/lms/static/sass/_discussion.scss @@ -3,7 +3,7 @@ $discussion_title_size: 1.6em; $comment_title_size: 1.0em; $comment_body_size: 0.9em; $comment_info_size: 0.75em; -$discussion_input_width: 90%; +$discussion_input_width: 100%; @mixin discussion-font { font-family: inherit; @@ -23,7 +23,8 @@ $discussion_input_width: 90%; .search-wrapper-inline { width: 80%; display: inline-block; - margin-top: 2%; + margin-top: 3%; + margin-bottom: 6%; } .discussion-search-form { margin-bottom: 1%; @@ -56,6 +57,7 @@ $discussion_input_width: 90%; .discussion-search-within-board { font-style: normal; font: inherit; + font-size: $comment_body_size; } .control-button { @include button; @@ -182,9 +184,13 @@ $discussion_input_width: 90%; -webkit-font-smoothing: antialiased; } } + .discussion-sort { + float: right; + margin-top: -2.5%; + } .discussion-content-edit, .discussion-reply-new, .new-post-form { .new-post-control, .edit-post-control { - margin-left: 70.5%; + margin-left: 80%; margin-top: 1%; } .control-button { @@ -193,13 +199,13 @@ $discussion_input_width: 90%; color: white; font-weight: bold; text-decoration: none; - margin-left: 3%; + margin-left: 10%; display: inline-block; padding-top: 9px; font-size: inherit; width: inherit; } - margin: 10px 0 10px 0; + margin: 10px 0 40px 0; } .thread { //display: none; diff --git a/lms/templates/discussion/_sort.html b/lms/templates/discussion/_sort.html index 7be0235ef2..ab27b36b2a 100644 --- a/lms/templates/discussion/_sort.html +++ b/lms/templates/discussion/_sort.html @@ -3,9 +3,9 @@ <%def name="link_to_sort(key, title)"> % if key == sort_key: % if sort_order.lower() == 'desc': - ${_link_to_sort(key, 'asc', title + ' (desc)')} + ${_link_to_sort(key, 'asc', title + ' [v]')} % else: - ${_link_to_sort(key, 'desc', title + '(asc)')} + ${_link_to_sort(key, 'desc', title + ' [^]')} % endif % else: ${_link_to_sort(key, 'desc', title)} @@ -26,6 +26,8 @@
Sort by: ${link_to_sort('date', 'Date')} + | ${link_to_sort('votes', 'Votes')} + | ${link_to_sort('comments', 'Comments')}