diff --git a/lms/static/sass/base/_variables.scss b/lms/static/sass/base/_variables.scss index ddfe6b5d27..5c8c8d18d9 100644 --- a/lms/static/sass/base/_variables.scss +++ b/lms/static/sass/base/_variables.scss @@ -62,6 +62,7 @@ $lighter-base-font-color: rgb(100,100,100); $text-color: $dark-gray; $body-bg: rgb(250,250,250); +$container-bg: $white; $header-image: linear-gradient(-90deg, rgba(255,255,255, 1), rgba(230,230,230, 0.9)); $header-bg: $white; $courseware-header-image: linear-gradient(top, #fff, #eee); @@ -100,6 +101,7 @@ $border-color-3: rgb(100,100,100); $border-color-4: rgb(252,252,252); $link-color: $blue; +$link-color-d1: $m-blue; $link-hover: $pink; $selection-color-1: $pink; $selection-color-2: #444; diff --git a/lms/static/sass/multicourse/_account.scss b/lms/static/sass/multicourse/_account.scss index 0e53a0bb30..dfd803a22d 100644 --- a/lms/static/sass/multicourse/_account.scss +++ b/lms/static/sass/multicourse/_account.scss @@ -22,7 +22,7 @@ margin: 0 0 $baseline 0; font-weight: 300; text-transform: uppercase; - color: $link-color; + color: $link-color-d1; } .heading-3 { @@ -37,7 +37,7 @@ font-weight: 600; text-transform: uppercase; letter-spacing: 0 !important; - color: saturate($link-color,15%); + color: saturate($link-color-d1,15%); } .heading-5 { @@ -63,7 +63,7 @@ // specific examples - buttons .button-primary { @include border-radius(0); - @include linear-gradient(saturate($link-color,15%) 5%, shade($link-color,15%) 95%); + @include linear-gradient(saturate($link-color-d1,15%) 5%, shade($link-color-d1,15%) 95%); display: inline-block; padding: $baseline/2 $baseline*2.5; text-transform: lowercase; @@ -107,7 +107,7 @@ @include clearfix; margin: 0 auto; width: 960px; - background: $white; + background: $container-bg; } .container { @@ -139,18 +139,18 @@ } a { - @include transition($link-color 0.15s ease-in-out, border 0.15s ease-in-out); + @include transition(color 0.15s ease-in-out, border 0.15s ease-in-out); &:link, &:visited, &:hover, &:active { - color: $link-color; + color: $link-color-d1; font-weight: 400; - text-decoration: none !important; + text-decoration: none !important; // needed but nasty font-family: $sans-serif; } &:hover, &:active { - border-bottom: 1px solid saturate($link-color,15%); - color: saturate($link-color,15%); + text-decoration: none !important; // needed but nasty + border-bottom: 1px dotted $link-color-d1; } } @@ -259,13 +259,13 @@ } label { - @include transition($link-color 0.15s ease-in-out); + @include transition(color 0.15s ease-in-out); margin: 0 0 ($baseline/4) 0; color: tint($black, 20%); } .tip { - @include transition($link-color 0.15s ease-in-out); + @include transition(color 0.15s ease-in-out); display: block; margin-top: ($baseline/4); color: tint($outer-border-color, 50%); @@ -340,11 +340,11 @@ &.is-focused { label { - color: saturate($link-color,15%); + color: saturate($link-color-d1,15%); } .tip { - color: saturate($link-color,15%); + color: saturate($link-color-d1,15%); } } diff --git a/lms/static/sass/shared/_header.scss b/lms/static/sass/shared/_header.scss index d791a0cc09..0e161b6327 100644 --- a/lms/static/sass/shared/_header.scss +++ b/lms/static/sass/shared/_header.scss @@ -280,7 +280,7 @@ header.global { a { @include border-radius(0); - @include linear-gradient(shade($link-color,15%) 5%, saturate($link-color,15%) 95%); + @include linear-gradient(saturate($link-color-d1,15%) 5%, shade($link-color-d1,15%) 95%); display: inline-block; padding: $baseline/2 $baseline*2.5; text-transform: lowercase;