diff --git a/lms/static/sass/multicourse/_account.scss b/lms/static/sass/multicourse/_account.scss index e5376fd7bf..4a517cacac 100644 --- a/lms/static/sass/multicourse/_account.scss +++ b/lms/static/sass/multicourse/_account.scss @@ -273,7 +273,7 @@ input, textarea { width: 100%; margin: 0; - padding: $baseline ($baseline*.75); + padding: $baseline ($baseline*.75); &.long { width: 100%; @@ -338,7 +338,7 @@ &.is-focused { label { - color: $m-blue-s1; + color: $m-blue-s1; } .tip { @@ -464,7 +464,7 @@ padding: 0 $baseline/4; } - #register-form, #login-form { + #register-form, #login-form, #passwordreset-form { .status.message { display: none; @@ -512,9 +512,26 @@ // password reset .view-passwordreset { + background: $m-gray-l2; + + header.global { + + h1 { + float: none; + } + } .introduction { + width: auto; + padding: 0; + header h1 { + margin: 0; + } + } + + .content { + margin-top: 0; } } @@ -586,7 +603,7 @@ width: 100%; } } - } + } } .modal-form-error { @@ -599,4 +616,4 @@ border-bottom: 3px solid shade($red, 10%); background: tint($red,95%); } -} \ No newline at end of file +} diff --git a/lms/templates/registration/password_reset_confirm.html b/lms/templates/registration/password_reset_confirm.html index aaf264949d..1f11b207bf 100644 --- a/lms/templates/registration/password_reset_confirm.html +++ b/lms/templates/registration/password_reset_confirm.html @@ -38,84 +38,94 @@ - + -
-
-
-

Reset Your edX Password

-
+
+ +
+ +
+
+
+
+

Reset Your edX Password

+
+
+ +
+ {% if validlink %} +
+

Password Reset Form

+
+ +
{% csrf_token %} + + + + + + + +

+ Please enter your new password twice so we can verify you typed it in correctly.
+ Required fields are noted by bold text and an asterisk (*). +

+ +
+ Required Information + +
    +
  1. + + +
    2. +
  2. + + +
    3. +
+
+ +
+ +
+
+ + {% else %} + +
+

Your Password Reset Was Unsuccessful

+
+

The password reset link was invalid, possibly because the link has already been used. Please request a new password reset.

+ + {% endif %} +
+ +
- -
- {% if validlink %} -
- -
- -
{% csrf_token %} - - - - - - - -

- Please enter your new password twice so we can verify you typed it in correctly.
- Required fields are noted by bold text and an asterisk (*). -

- -
- - -
    -
  1. - - -
    2. -
  2. - - -
    3. -
-
- -
- -
-
- - {% else %} - -
- -
-

The password reset link was invalid, possibly because the link has already been used. Please request a new password reset.

- - {% endif %} -
- -