diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee index 82d00255ae..f97bb2dddd 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee @@ -14,6 +14,7 @@ if Backbone? render: -> @template = _.template($("#thread-template").html()) @$el.html(@template(@model.toJSON())) + @$el.find(".loading").hide() @delegateEvents() @renderShowView() @@ -27,7 +28,10 @@ if Backbone? if @responsesRequest? @responsesRequest.abort() - renderResponses: -> + renderResponses: -> + setTimeout(=> + @$el.find(".loading").show() + , 200) @responsesRequest = DiscussionUtil.safeAjax url: "/courses/#{$$course_id}/discussion/forum/#{@model.get('commentable_id')}/threads/#{@model.id}" success: (data, textStatus, xhr) => diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss index 8386314ef9..2e3aed996f 100644 --- a/lms/static/sass/_discussion.scss +++ b/lms/static/sass/_discussion.scss @@ -1309,7 +1309,7 @@ body.discussion { > li { position: relative; margin: 0 -10px 30px; - padding: 26px 30px 30px; + padding: 26px 30px 20px; border-radius: 3px; border: 1px solid #b2b2b2; box-shadow: 0 1px 3px rgba(0, 0, 0, .15); @@ -1573,6 +1573,7 @@ body.discussion { .discussion-reply-new { padding: 20px; @include clearfix; + @include transition(opacity .2s); h4 { font-size: 16px;