From 8b54c13fbc723d5fba3f61164beb4ce4d6d69ef7 Mon Sep 17 00:00:00 2001 From: uzairr Date: Fri, 8 Sep 2017 14:31:28 +0000 Subject: [PATCH] Fix inconsistency in the active tab colors The course header sass source is generating styles that eventually are in conflict with some of the tabs.To avoid it, new style properties are added that resolves it. LEARNER-748 --- lms/static/sass/course/layout/_courseware_header.scss | 1 + lms/static/sass/shared-v2/_components.scss | 6 +++--- lms/static/sass/shared-v2/_variables.scss | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lms/static/sass/course/layout/_courseware_header.scss b/lms/static/sass/course/layout/_courseware_header.scss index 09a2472e3f..fdcd07459a 100644 --- a/lms/static/sass/course/layout/_courseware_header.scss +++ b/lms/static/sass/course/layout/_courseware_header.scss @@ -48,6 +48,7 @@ &.active { color: $uxpl-blue-hover-active; border-bottom-color: $uxpl-blue-hover-active; + background-color: transparent; } } } diff --git a/lms/static/sass/shared-v2/_components.scss b/lms/static/sass/shared-v2/_components.scss index cabb4e45cf..576c779d2c 100644 --- a/lms/static/sass/shared-v2/_components.scss +++ b/lms/static/sass/shared-v2/_components.scss @@ -30,7 +30,7 @@ border-style: solid; border-width: 0 0 4px 0; border-bottom-color: transparent; - color: $lms-label-color; + color: $lms-inactive-color; font-size: 14px; &:hover, @@ -40,8 +40,8 @@ } &.active { - color: $lms-active-color; - border-bottom-color: $lms-active-color; + color: $uxpl-blue-hover-active; + border-bottom-color: $uxpl-blue-hover-active; background-color: transparent; } } diff --git a/lms/static/sass/shared-v2/_variables.scss b/lms/static/sass/shared-v2/_variables.scss index e9e84343ff..37a1be7561 100644 --- a/lms/static/sass/shared-v2/_variables.scss +++ b/lms/static/sass/shared-v2/_variables.scss @@ -26,6 +26,7 @@ $lms-border-color: palette(grayscale, back) !default; $lms-label-color: palette(grayscale, black) !default; $lms-active-color: palette(primary, base) !default; $lms-preview-menu-color: #c8c8c8 !default; +$lms-inactive-color: rgb(94,94,94) !default; $success-color: palette(success, accent) !default; $success-color-hover: palette(success, text) !default;