From 284b1a0fdfb75aa25c9479d279138c45c7b5660d Mon Sep 17 00:00:00 2001 From: Chris Rodriguez Date: Wed, 2 Dec 2015 11:09:11 -0500 Subject: [PATCH 1/2] LMS: darkening blue on Studio links --- lms/static/sass/base/_variables.scss | 2 -- lms/static/sass/course/courseware/_courseware.scss | 6 +++--- lms/static/sass/multicourse/_course_about.scss | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lms/static/sass/base/_variables.scss b/lms/static/sass/base/_variables.scss index 6f139bec0b..934bf2e676 100644 --- a/lms/static/sass/base/_variables.scss +++ b/lms/static/sass/base/_variables.scss @@ -67,8 +67,6 @@ $gray-d2: shade($gray,40%) !default; $gray-d3: shade($gray,60%) !default; $gray-d4: shade($gray,80%) !default; - -$blue: rgb(0, 120, 176); $yellow: rgb(255, 252, 221); $pink: rgb(182,37,103); diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss index b0b3b2f429..f5a2ff6b37 100644 --- a/lms/static/sass/course/courseware/_courseware.scss +++ b/lms/static/sass/course/courseware/_courseware.scss @@ -30,16 +30,16 @@ html.video-fullscreen { .instructor-info-action { @extend %t-copy-sub2; @include float(right); - margin-left: ($baseline/2); + @include margin-left($baseline/2); padding: ($baseline/4) ($baseline/2); border-radius: ($baseline/4); background-color: $shadow-l2; text-align: right; text-transform: uppercase; - color: $lighter-base-font-color; + color: $blue-d1; &:hover { - background-color: $link-hover; + background-color: $blue-d1; color: $white; } } diff --git a/lms/static/sass/multicourse/_course_about.scss b/lms/static/sass/multicourse/_course_about.scss index 5027ccdc67..95e32b00a3 100644 --- a/lms/static/sass/multicourse/_course_about.scss +++ b/lms/static/sass/multicourse/_course_about.scss @@ -252,10 +252,10 @@ background-color: $shadow-l2; text-align: right; text-transform: uppercase; - color: $lighter-base-font-color; + color: $blue-d1; &:hover { - background-color: $link-hover; + background-color: $blue-d1; color: $white; } } From deaa04466952034c6cb338fc342aa3b49e11af9d Mon Sep 17 00:00:00 2001 From: Chris Rodriguez Date: Wed, 2 Dec 2015 12:10:56 -0500 Subject: [PATCH 2/2] Changing blue to pink as was previously there --- lms/static/sass/base/_variables.scss | 3 +++ lms/static/sass/course/courseware/_courseware.scss | 4 ++-- lms/static/sass/multicourse/_course_about.scss | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lms/static/sass/base/_variables.scss b/lms/static/sass/base/_variables.scss index 934bf2e676..7247365dc3 100644 --- a/lms/static/sass/base/_variables.scss +++ b/lms/static/sass/base/_variables.scss @@ -301,6 +301,9 @@ $audit-color-lvl2: tint($audit-color-lvl1, 33%); // edx-specific: credit $credit-color-base: rgb(244,195,0); // accessible with black text +// edx-specific: Studio/Staff actions +$staff-color: $pink; + // ---------------------------- // #TYPOGRAPHY diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss index f5a2ff6b37..67734d133a 100644 --- a/lms/static/sass/course/courseware/_courseware.scss +++ b/lms/static/sass/course/courseware/_courseware.scss @@ -36,10 +36,10 @@ html.video-fullscreen { background-color: $shadow-l2; text-align: right; text-transform: uppercase; - color: $blue-d1; + color: $staff-color; &:hover { - background-color: $blue-d1; + background-color: $staff-color; color: $white; } } diff --git a/lms/static/sass/multicourse/_course_about.scss b/lms/static/sass/multicourse/_course_about.scss index 95e32b00a3..419dadb2d2 100644 --- a/lms/static/sass/multicourse/_course_about.scss +++ b/lms/static/sass/multicourse/_course_about.scss @@ -252,10 +252,10 @@ background-color: $shadow-l2; text-align: right; text-transform: uppercase; - color: $blue-d1; + color: $staff-color; &:hover { - background-color: $blue-d1; + background-color: $staff-color; color: $white; } }