diff --git a/lms/static/images/bg-banner-login.png b/lms/static/images/bg-banner-login.png index 4bbba21628..85b3ad3c48 100644 Binary files a/lms/static/images/bg-banner-login.png and b/lms/static/images/bg-banner-login.png differ diff --git a/lms/static/images/bg-banner-register.png b/lms/static/images/bg-banner-register.png index f1fe626f05..807be395fa 100644 Binary files a/lms/static/images/bg-banner-register.png and b/lms/static/images/bg-banner-register.png differ diff --git a/lms/static/sass/base/_variables.scss b/lms/static/sass/base/_variables.scss index 6bd593c28c..2d0021c642 100644 --- a/lms/static/sass/base/_variables.scss +++ b/lms/static/sass/base/_variables.scss @@ -46,8 +46,9 @@ $m-gray: rgb(153,153,153); $m-gray-d1: rgb(102,102,102); $m-gray-d2: rgb(51,51,51); $m-gray-a1: rgb(80,80,80); -$m-blue: rgb(85, 151, 221); -$m-blue-l1: rgb(230,245,252); +$m-blue: rgb(65, 116, 170); +// $m-blue: rgb(85, 151, 221); (used in marketing redesign) +$m-blue-l1: rgb(85, 151, 221); $m-blue-d1: shade($m-blue,15%); $m-blue-s1: saturate($m-blue,15%); $m-pink: rgb(204,51,102); @@ -122,4 +123,4 @@ $modal-bg-color: rgb(245,245,245); //----------------- $homepage-bg-image: '../images/homepage-bg.jpg'; -$video-thumb-url: '../images/courses/video-thumb.jpg'; \ No newline at end of file +$video-thumb-url: '../images/courses/video-thumb.jpg'; diff --git a/lms/static/sass/multicourse/_account.scss b/lms/static/sass/multicourse/_account.scss index eab8cbe66b..5147b6a09b 100644 --- a/lms/static/sass/multicourse/_account.scss +++ b/lms/static/sass/multicourse/_account.scss @@ -148,8 +148,8 @@ } &:hover, &:active { - border-bottom: 1px dotted $m-blue-s1; - color: $m-blue-s1; + border-bottom: 1px dotted $m-blue-l1; + color: $m-blue-l1; } } @@ -339,11 +339,11 @@ &.is-focused { label { - color: $m-blue-s1; + color: $m-blue-l1; } .tip { - color: $m-blue-s1; + color: $m-blue-l1; } } diff --git a/lms/static/sass/shared/_header.scss b/lms/static/sass/shared/_header.scss index 0608a8faf4..e49accf904 100644 --- a/lms/static/sass/shared/_header.scss +++ b/lms/static/sass/shared/_header.scss @@ -317,13 +317,13 @@ header.global { } // page-based nav states -.view-howitworks .nav-global-01, -.view-courses .nav-global-02, -.view-schools .nav-global-03, +.view-howitworks .nav-global-01, +.view-courses .nav-global-02, +.view-schools .nav-global-03, .view-register .nav-global-04 { a { text-decoration: none; color: $m-blue-s1 !important; - } + } } diff --git a/lms/templates/login.html b/lms/templates/login.html index 3e33c84b7a..91210e7bb7 100644 --- a/lms/templates/login.html +++ b/lms/templates/login.html @@ -1,7 +1,10 @@ <%inherit file="main.html" /> <%namespace name='static' file='static_content.html'/> + <%! from django.core.urlresolvers import reverse %> +<%! from django.utils.translation import ugettext as _ %> + <%block name="title">Log into your edX Account <%block name="js_extra"> @@ -77,14 +80,14 @@
-

Log Into Your Account

+

${_("Log Into Your Account")}

-

Login Form

+

${_("Login Form")}

diff --git a/lms/templates/register.html b/lms/templates/register.html index 06b6fe169a..61328bffa0 100644 --- a/lms/templates/register.html +++ b/lms/templates/register.html @@ -2,9 +2,11 @@ <%namespace name='static' file='static_content.html'/> <%namespace file='main.html' import="login_query"/> + <%! from django.core.urlresolvers import reverse %> <%! from django.utils import html %> <%! from django_countries.countries import COUNTRIES %> +<%! from django.utils.translation import ugettext as _ %> <%! from student.models import UserProfile %> <%! from datetime import date %> <%! import calendar %> @@ -81,14 +83,14 @@
-

Register for edX

+

${_("Register for edX")}

-

Registration Form

+

${_("Welcome! Register below to create your edX account")}

@@ -262,10 +264,10 @@

Need Help?

-

Need help in registering with edX? +

Need help in registering with edX? View our FAQs for answers to commonly asked questions. - + Once registered, most questions can be answered in the course specific discussion forums or through the FAQs.