From ce310f6a618130c12a21df1a808e228cc2baf83f Mon Sep 17 00:00:00 2001 From: Brian Jacobel Date: Mon, 27 Jun 2016 15:47:40 -0400 Subject: [PATCH] Fix reading view state for discussion thread listing --- .../sass/discussion/elements/_navigation.scss | 20 +++++++++++++++---- .../discussion/utilities/_variables-v1.scss | 1 + .../discussion/utilities/_variables-v2.scss | 1 + 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/lms/static/sass/discussion/elements/_navigation.scss b/lms/static/sass/discussion/elements/_navigation.scss index 3b501971d6..b4196084a3 100644 --- a/lms/static/sass/discussion/elements/_navigation.scss +++ b/lms/static/sass/discussion/elements/_navigation.scss @@ -207,6 +207,7 @@ .forum-nav-thread { border-bottom: 1px solid $forum-color-border; background-color: $forum-color-background; + margin-bottom: 0; &.is-unread { background: $forum-color-background; @@ -226,19 +227,30 @@ .forum-nav-thread-link { display: block; padding: ($baseline/4) ($baseline/2); + transition: none; - &.is-active { - background-color: $forum-color-background; - color: $base-font-color; + &.is-active, + &:hover { + color: $forum-color-background; + background-color: $forum-color-hover-thread; + + .forum-nav-thread-labels > li { + border-color: $forum-color-background; + color: $forum-color-background; + } .forum-nav-thread-comments-count { - background-color: $gray-l4; + background-color: $forum-color-background; color: $base-font-color; &:after { border-right-color: $gray-l4; } } + + span.icon { + color: $forum-color-background; + } } .forum-nav-thread-comments-count { diff --git a/lms/static/sass/discussion/utilities/_variables-v1.scss b/lms/static/sass/discussion/utilities/_variables-v1.scss index e7af8e025a..1e0c0de1ec 100644 --- a/lms/static/sass/discussion/utilities/_variables-v1.scss +++ b/lms/static/sass/discussion/utilities/_variables-v1.scss @@ -14,6 +14,7 @@ $forum-color-community-ta: $green-d1 !default; $forum-color-marked-answer: $green-d1 !default; $forum-color-border: $gray-l3 !default; $forum-color-error: $red !default; +$forum-color-hover-thread: $gray-d3 !default; // post images $post-image-dimension: ($baseline*3) !default; // image size + margin diff --git a/lms/static/sass/discussion/utilities/_variables-v2.scss b/lms/static/sass/discussion/utilities/_variables-v2.scss index ee2809fe1c..e5e845a87f 100644 --- a/lms/static/sass/discussion/utilities/_variables-v2.scss +++ b/lms/static/sass/discussion/utilities/_variables-v2.scss @@ -14,6 +14,7 @@ $forum-color-community-ta: $green-d1 !default; $forum-color-marked-answer: $green-d1 !default; $forum-color-border: palette(grayscale, base) !default; $forum-color-error: palette(error, accent) !default; +$forum-color-hover-thread: palette(grayscale, dark) !default; // post images $post-image-dimension: ($baseline*3) !default; // image size + margin