From 7287e8ef857b54d7c184561df1319e0168e4905e Mon Sep 17 00:00:00 2001 From: Andy Armstrong Date: Mon, 12 Dec 2016 17:07:06 -0500 Subject: [PATCH] Fix a number of styling bugs --- .../views/discussion_thread_list_view.js | 7 +++- .../js/views/discussion_board_view.js | 3 +- .../sass/discussion/elements/_labels.scss | 2 +- .../sass/discussion/elements/_navigation.scss | 42 +++---------------- .../discussion/utilities/_variables-v1.scss | 4 +- .../discussion/utilities/_variables-v2.scss | 2 +- 6 files changed, 16 insertions(+), 44 deletions(-) diff --git a/common/static/common/js/discussion/views/discussion_thread_list_view.js b/common/static/common/js/discussion/views/discussion_thread_list_view.js index b6176773e3..7fe3df260c 100644 --- a/common/static/common/js/discussion/views/discussion_thread_list_view.js +++ b/common/static/common/js/discussion/views/discussion_thread_list_view.js @@ -91,6 +91,7 @@ DiscussionThreadListView.prototype.initialize = function(options) { var self = this; this.courseSettings = options.courseSettings; + this.supportsActiveThread = options.supportsActiveThread; this.displayedCollection = new Discussion(this.collection.models, { pages: this.collection.pages }); @@ -164,7 +165,7 @@ active = $currentElement.has('.forum-nav-thread-link.is-active').length !== 0; $currentElement.replaceWith($content); this.showMetadataAccordingToSort(); - if (active) { + if (this.supportsActiveThread && active) { this.setActiveThread(threadId); } }; @@ -347,7 +348,9 @@ DiscussionThreadListView.prototype.threadSelected = function(e) { var threadId; threadId = $(e.target).closest('.forum-nav-thread').attr('data-id'); - this.setActiveThread(threadId); + if (this.supportsActiveThread) { + this.setActiveThread(threadId); + } this.trigger('thread:selected', threadId); return false; }; diff --git a/lms/djangoapps/discussion/static/discussion/js/views/discussion_board_view.js b/lms/djangoapps/discussion/static/discussion/js/views/discussion_board_view.js index cf9c2cba7b..075fcdf3f9 100644 --- a/lms/djangoapps/discussion/static/discussion/js/views/discussion_board_view.js +++ b/lms/djangoapps/discussion/static/discussion/js/views/discussion_board_view.js @@ -45,7 +45,8 @@ this.discussionThreadListView = new DiscussionThreadListView({ collection: this.discussion, el: this.$('.discussion-thread-list-container'), - courseSettings: this.courseSettings + courseSettings: this.courseSettings, + supportsActiveThread: true }).render(); this.searchView = new DiscussionSearchView({ el: this.$('.forum-search') diff --git a/lms/static/sass/discussion/elements/_labels.scss b/lms/static/sass/discussion/elements/_labels.scss index 8ea2f38922..66d0e56047 100644 --- a/lms/static/sass/discussion/elements/_labels.scss +++ b/lms/static/sass/discussion/elements/_labels.scss @@ -1,7 +1,7 @@ // discussion - elements - labels // ==================== -body.discussion, .discussion-module { +.forum-nav-thread { .post-label { @include margin($baseline/4, $baseline/2, 0, 0); @extend %t-weight4; diff --git a/lms/static/sass/discussion/elements/_navigation.scss b/lms/static/sass/discussion/elements/_navigation.scss index b437573bca..170fc80118 100644 --- a/lms/static/sass/discussion/elements/_navigation.scss +++ b/lms/static/sass/discussion/elements/_navigation.scss @@ -205,7 +205,7 @@ @include padding-left(0); list-style: none; - li { + .forum-nav-thread { margin: 0; } } @@ -239,6 +239,10 @@ background-color: $forum-color-hover-thread; } + &.is-active { + background-color: $forum-color-reading-thread; + } + .forum-nav-thread-unread-comments-count { display: inline-block; font-size: $forum-small-font-size; @@ -246,8 +250,6 @@ } } - .discussion:not(.inline-discussion) - &.never-read { .forum-nav-thread-link { @include border-left(3px solid $forum-color-never-read-post); @@ -256,40 +258,6 @@ } } -.discussion.discussion-board { - .forum-nav-thread { - .forum-nav-thread-link.is-active { - color: $forum-color-background; - background-color: $forum-color-reading-thread; - - .forum-nav-thread-labels > li { - border-color: $forum-color-background; - color: $forum-color-background; - } - - .forum-nav-thread-votes-count { - color: $forum-color-background; - } - - .forum-nav-thread-comments-count { - color: $base-font-color; - - &:after { - @include border-right-color($forum-color-border); - } - } - - span.icon { - color: $forum-color-background; - } - - .thread-preview-body { - color: $forum-color-background; - } - } - } -} - %forum-nav-thread-wrapper { display: inline-block; vertical-align: middle; diff --git a/lms/static/sass/discussion/utilities/_variables-v1.scss b/lms/static/sass/discussion/utilities/_variables-v1.scss index 289b48089b..a51f9b7c44 100644 --- a/lms/static/sass/discussion/utilities/_variables-v1.scss +++ b/lms/static/sass/discussion/utilities/_variables-v1.scss @@ -20,8 +20,8 @@ $forum-color-border: $gray-l3 !default; $forum-color-error: $red !default; $forum-color-hover-thread: #f6f6f6 !default; $forum-color-reading-thread: $gray-d3 !default; -$forum-color-read-post: $forum-color-primary !default; -$forum-color-never-read-post: $gray-d3 !default; +$forum-color-read-post: $gray-d3 !default; +$forum-color-never-read-post: $forum-color-primary !default; $forum-color-editor-preview-label: $gray-d2 !default; $forum-color-response-count: $gray-d2 !default; $forum-color-navigation-bar: #f6f6f6 !default; diff --git a/lms/static/sass/discussion/utilities/_variables-v2.scss b/lms/static/sass/discussion/utilities/_variables-v2.scss index a96b7e6caa..ab5c416728 100644 --- a/lms/static/sass/discussion/utilities/_variables-v2.scss +++ b/lms/static/sass/discussion/utilities/_variables-v2.scss @@ -19,7 +19,7 @@ $forum-color-marked-answer: palette(success, text) !default; $forum-color-border: palette(grayscale, back) !default; $forum-color-error: palette(error, accent) !default; $forum-color-hover-thread: palette(grayscale, x-back) !default; -$forum-color-reading-thread: $forum-color-primary !default; +$forum-color-reading-thread: palette(grayscale, x-back) !default; $forum-color-read-post: palette(grayscale, base) !default; $forum-color-never-read-post: $forum-color-primary !default; $forum-color-editor-preview-label: palette(grayscale, base) !default;