diff --git a/common/static/common/templates/discussion/thread-response-show.underscore b/common/static/common/templates/discussion/thread-response-show.underscore index fc227aca2f..29cbd233d8 100644 --- a/common/static/common/templates/discussion/thread-response-show.underscore +++ b/common/static/common/templates/discussion/thread-response-show.underscore @@ -1,4 +1,4 @@ -
+
<%= author_display %>

diff --git a/common/static/common/templates/discussion/thread-show.underscore b/common/static/common/templates/discussion/thread-show.underscore index bf8aab3bdc..5055f5be29 100644 --- a/common/static/common/templates/discussion/thread-show.underscore +++ b/common/static/common/templates/discussion/thread-show.underscore @@ -1,5 +1,5 @@

-
+
<% if (!readOnly) { %>
<%= diff --git a/lms/static/sass/discussion/_mixins.scss b/lms/static/sass/discussion/_mixins.scss index cc8861bf59..482e8d3a9f 100644 --- a/lms/static/sass/discussion/_mixins.scss +++ b/lms/static/sass/discussion/_mixins.scss @@ -43,16 +43,16 @@ @mixin discussion-wmd-preview-container { @include border-radius(0, 0, $forum-border-radius, $forum-border-radius); box-sizing: border-box; - border: 1px solid $gray-l1; + border: 1px solid $forum-color-border; border-top: none; width: 100%; - background: $gray-l4; + background: $forum-color-background-light; box-shadow: 0 1px 3px $shadow-l1 inset; } @mixin discussion-new-post-wmd-preview-container { @include discussion-wmd-preview-container; - border-color: $gray-d3; + border-color: $forum-color-border; box-shadow: 0 1px 3px $shadow-d1 inset; } @@ -67,7 +67,7 @@ @mixin discussion-wmd-preview { padding: ($baseline/2) $baseline; width: auto; - color: $gray-d3; + color: $forum-color-background-light; ol, ul { // Fix up the RTL-only _reset.scss, but only in specific places @include padding-left($baseline*2); diff --git a/lms/static/sass/discussion/utilities/_shame.scss b/lms/static/sass/discussion/utilities/_shame.scss index 31f1713ede..253cef89b7 100644 --- a/lms/static/sass/discussion/utilities/_shame.scss +++ b/lms/static/sass/discussion/utilities/_shame.scss @@ -118,7 +118,7 @@ li[class*=forum-nav-thread-label-] { // ------- .discussion-module { - .wrapper-post-header { + .post-header { margin-bottom: 0 !important; // overrides default header styling padding-bottom: 0 !important; // overrides default header styling @@ -135,3 +135,17 @@ li[class*=forum-nav-thread-label-] { } } } + +// overrides courseware styling to keep views consistent everywhere +.discussion-article { + .response-header { + line-height: 1 !important; + font-size: $forum-base-font-size !important; + margin-bottom: 0 !important; + padding-bottom: 0 !important; + } + + p { + margin-bottom: 0 !important; + } +} diff --git a/lms/static/sass/discussion/views/_response.scss b/lms/static/sass/discussion/views/_response.scss index ee465cd8c1..bf9c7dd587 100644 --- a/lms/static/sass/discussion/views/_response.scss +++ b/lms/static/sass/discussion/views/_response.scss @@ -42,8 +42,7 @@ } // +base - single response element -.container .discussion-response { - +.discussion-response { .response-header-content { // CASE: larger username for responses diff --git a/lms/static/sass/discussion/views/_thread.scss b/lms/static/sass/discussion/views/_thread.scss index 20ab26f958..7570e9e426 100644 --- a/lms/static/sass/discussion/views/_thread.scss +++ b/lms/static/sass/discussion/views/_thread.scss @@ -16,7 +16,10 @@ .post-header-actions { @include float(right); } +} +// post article +.discussion-article { .posted-details { @extend %t-copy-sub2; margin: ($baseline/5) 0; @@ -129,7 +132,9 @@ } .discussion-response .response-body { - @include padding-right($baseline); //ensures content doesn't overlap on post or response actions. + @include padding(($baseline/2), $baseline, 0, 0); //ensures content doesn't overlap on post or response actions. + margin-bottom: 0.2em; + font-size: $forum-base-font-size; } // +post - individual element styling @@ -221,11 +226,6 @@ font-size: $forum-large-font-size; } } - - .response-body { - margin-bottom: 0.2em; - font-size: $forum-base-font-size; - } } .discussion-reply-new {