From fd0023448f3890f3140099f02ca25eeb9bed2f47 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Wed, 8 Feb 2012 13:54:08 -0500 Subject: [PATCH 1/3] Added new styles for errors and added flash to show the user resubmitted the form --HG-- branch : kf-login-errors --- login.html | 1 - marketing.html | 4 +++- sass/_leanmodal.scss | 11 +++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/login.html b/login.html index 601df0a4c6..a36dc2ed28 100644 --- a/login.html +++ b/login.html @@ -4,7 +4,6 @@ ${ error }

Log in to MITx

-
  1. diff --git a/marketing.html b/marketing.html index d32a24e798..91401659cc 100644 --- a/marketing.html +++ b/marketing.html @@ -122,8 +122,10 @@ $(document).ready(function(){ function(json) { if(json.success) { location.href="/courseware"; + } else if($('#login_error').length == 0) { + $('#login_form').prepend('
    Email or password is incorrect.
    '); } else { - $('#login_error').html("Invalid Login"); + $('#login_error').stop().css("background-color", "#933").animate({ backgroundColor: "#333"}, 2000); } } ); diff --git a/sass/_leanmodal.scss b/sass/_leanmodal.scss index db8b0950f5..32b45bb7de 100644 --- a/sass/_leanmodal.scss +++ b/sass/_leanmodal.scss @@ -65,14 +65,17 @@ div.leanModal_box { text-align: left; div#enroll_error, div#login_error, div#pwd_error { + $error-color: #333; -webkit-font-smoothing: antialiased; - background-color: #F50200; + background-color: $error-color; + border: darken($error-color, 20%); color: #fff; + text-shadow: 0 1px 0 darken($error-color, 10%); + font-family: "Open sans"; font-weight: bold; letter-spacing: 1px; - margin-bottom: lh(); - padding: lh(.2); - text-transform: uppercase; + margin: (-(lh())) (-(lh())) lh(); + padding: lh(.5); &:empty { padding: 0; From aeb5357e0e2108fb8f94af21719584780ab365f7 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 9 Feb 2012 12:06:52 -0500 Subject: [PATCH 2/3] added more style to enroll buttons --HG-- branch : kf-login-errors --- index.html | 1 + marketing.html | 1 - sass/_index-extends.scss | 4 +++- sass/_index.scss | 12 ++++++++---- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index b7abcd84e3..b1ee886b07 100644 --- a/index.html +++ b/index.html @@ -10,6 +10,7 @@

    6.002x (Circuits and Electronics) is an experimental on-line adaptation of MIT’s first undergraduate analog design course: 6.002. This course will run, free of charge, for students worldwide from March 1, 2012 through June 8, 2012.

    + <%block name="header_class">course
    diff --git a/marketing.html b/marketing.html index 91401659cc..34768f67bb 100644 --- a/marketing.html +++ b/marketing.html @@ -87,7 +87,6 @@ function postJSON(url, data, callback) { <%block name="bodyextra"/>