From e1fae8e885ee16d741dc8c1fb3c065898cf4579e Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Tue, 22 Jan 2013 14:31:08 -0500 Subject: [PATCH] drupal integration - color syncing with marketing site standards --- lms/static/sass/base/_variables.scss | 3 ++- lms/static/sass/multicourse/_account.scss | 10 +++++----- lms/static/sass/shared/_footer.scss | 6 +++--- lms/static/sass/shared/_header.scss | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lms/static/sass/base/_variables.scss b/lms/static/sass/base/_variables.scss index c2e4fad344..83b3109f28 100644 --- a/lms/static/sass/base/_variables.scss +++ b/lms/static/sass/base/_variables.scss @@ -28,7 +28,8 @@ $outer-border-color: rgb(170, 170, 170); // edx.org-related $m-gray-l: rgb(247, 247, 247); $m-gray: rgb(67,67,67); -$m-blue: rgb(2,159,211); +$m-blue: rgb(23,135,183); +$m-blue-s: rgb(2,159,211); $m-base-font-size: em(16); diff --git a/lms/static/sass/multicourse/_account.scss b/lms/static/sass/multicourse/_account.scss index 82117b21ae..6342c78f88 100644 --- a/lms/static/sass/multicourse/_account.scss +++ b/lms/static/sass/multicourse/_account.scss @@ -49,8 +49,8 @@ } &:hover, &:active { - border-bottom: 1px dotted shade($m-blue, 20%); - color: shade($m-blue, 20%); + border-bottom: 1px dotted $m-blue-s; + color: $m-blue-s; } } @@ -285,11 +285,11 @@ &.is-focused { label { - color: $m-blue; + color: $m-blue-s; } .tip { - color: tint($m-blue, 30%); + color: $m-blue-s; } } @@ -335,7 +335,7 @@ @include clearfix(); button[type="submit"] { - @include button(simple, $blue); + @include button(simple, $m-blue-s); @include box-sizing(border-box); @include border-radius(3px); padding: ($baseline*0.75) $baseline; diff --git a/lms/static/sass/shared/_footer.scss b/lms/static/sass/shared/_footer.scss index 62b0a25b40..72fd3c00ce 100644 --- a/lms/static/sass/shared/_footer.scss +++ b/lms/static/sass/shared/_footer.scss @@ -25,8 +25,8 @@ } &:hover, &:active { - border-bottom: 1px dotted shade($m-blue, 20%); - color: shade($m-blue, 20%); + border-bottom: 1px dotted $m-blue-s; + color: $m-blue-s; } } @@ -48,7 +48,7 @@ color: tint($black, 20%); &:hover, &:active { - color: shade($m-blue, 20%); + color: $m-blue-s; } } diff --git a/lms/static/sass/shared/_header.scss b/lms/static/sass/shared/_header.scss index b676270261..5e5f51f5a4 100644 --- a/lms/static/sass/shared/_header.scss +++ b/lms/static/sass/shared/_header.scss @@ -275,7 +275,7 @@ header.global { &:hover, &:active { text-decoration: none; - color: $m-blue; + color: $m-blue-s; } } } @@ -295,7 +295,7 @@ header.global { display: inline-block; a { - @include button(simple, $blue); + @include button(simple, $m-blue); @include box-sizing(border-box); @include border-radius(3px); padding: ($baseline/4) ($baseline/2);