diff --git a/lms/static/sass/_password_reset.scss b/lms/static/sass/_password_reset.scss new file mode 100644 index 0000000000..292ca34e77 --- /dev/null +++ b/lms/static/sass/_password_reset.scss @@ -0,0 +1,94 @@ +.password-reset { + background: rgb(245,245,245); + border: 1px solid rgb(200,200,200); + @include border-radius(4px); + @include box-sizing(border-box); + @include box-shadow(0 5px 50px 0 rgba(0,0,0, 0.3)); + margin: 120px auto 0; + padding: 0px 40px 40px; + width: grid-width(5); + + header { + margin-bottom: 30px; + overflow: hidden; + padding: 28px 20px 0px; + position: relative; + z-index: 2; + + &::before { + @include background-image(radial-gradient(50% 50%, circle closest-side, rgba(255,255,255, 0.8) 0%, rgba(255,255,255, 0) 100%)); + content: ""; + display: block; + height: 400px; + left: 0px; + margin: 0 auto; + position: absolute; + top: -140px; + width: 100%; + z-index: 1; + } + + hr { + @extend .faded-hr-divider-light; + border: none; + margin: 0px; + position: relative; + z-index: 2; + + &::after { + @extend .faded-hr-divider; + bottom: 0px; + content: ""; + display: block; + position: absolute; + top: -1px; + } + } + + h2 { + position: relative; + text-align: center; + text-shadow: 0 1px rgba(255,255,255, 0.4); + z-index: 2; + } + } + + > p { + margin-bottom: 20px; + } + + form { + margin-bottom: 12px; + position: relative; + z-index: 2; + + label { + display: none; + } + + input[type="checkbox"] { + margin-right: 5px; + } + + input[type="email"], + input[type="text"], + input[type="password"] { + background: rgb(255,255,255); + display: block; + height: 45px; + margin-bottom: 20px; + width: 100%; + } + + .submit { + padding-top: 10px; + + input[type="submit"] { + display: block; + height: 45px; + margin: 0 auto; + width: 100%; + } + } + } +} diff --git a/lms/static/sass/application.scss b/lms/static/sass/application.scss index 2daa0da8e9..cbca88c45d 100644 --- a/lms/static/sass/application.scss +++ b/lms/static/sass/application.scss @@ -32,6 +32,7 @@ @import 'jobs'; @import 'about_pages'; @import 'press_release'; +@import 'password_reset'; // Courseware styles diff --git a/lms/static/sass/shared/_modal.scss b/lms/static/sass/shared/_modal.scss index 1ac3bbcbb2..083bf1cf7c 100644 --- a/lms/static/sass/shared/_modal.scss +++ b/lms/static/sass/shared/_modal.scss @@ -177,51 +177,6 @@ } } - .honor-code-summary { - margin-bottom: 20px; - padding: 0px; - position: relative; - - p { - color: $lighter-base-font-color; - font-family: $sans-serif; - } - - hr { - @extend .faded-hr-divider-light; - border: none; - margin-top: 30px; - position: relative; - z-index: 2; - - &::after { - @extend .faded-hr-divider; - bottom: 0px; - content: ""; - display: block; - position: absolute; - top: -1px; - } - } - - ul { - @include box-sizing(border-box); - margin: 0; - padding: 0 0 0 20px; - width: 100%; - - li { - color: $lighter-base-font-color; - font: 300 1.2rem/1.6rem $sans-serif; - margin-bottom: 10px; - - &:last-child { - margin-bottom: 0px; - } - } - } - } - .submit { padding-top: 10px; diff --git a/lms/templates/registration/password_reset_confirm.html b/lms/templates/registration/password_reset_confirm.html index 46a9005ee8..e80955180c 100644 --- a/lms/templates/registration/password_reset_confirm.html +++ b/lms/templates/registration/password_reset_confirm.html @@ -16,33 +16,51 @@ -{% block content %} -
+
+ +
-{% if validlink %} + {% block content %} +
-

Enter new password

+ {% if validlink %} -

Please enter your new password twice so we can verify you typed it in correctly.

+
+

Enter new password

+
+
-
{% csrf_token %} -{{ form.new_password1.errors }} -

{{ form.new_password1 }}

-{{ form.new_password2.errors }} -

{{ form.new_password2 }}

-

-
+

Please enter your new password twice so we can verify you typed it in correctly.

-{% else %} +
{% csrf_token %} + {{ form.new_password1.errors }} + + {{ form.new_password1 }} -

Password reset unsuccessful

+ {{ form.new_password2.errors }} + + {{ form.new_password2 }} -

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

+
+ +
+
-{% endif %} + {% else %} -
-{% endblock %} +
+

Password reset unsuccessful

+
+
+ +

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

+ + {% endif %} + +
+ {% endblock %} diff --git a/lms/templates/registration/password_reset_done.html b/lms/templates/registration/password_reset_done.html index f47a520e0a..0b029a854f 100644 --- a/lms/templates/registration/password_reset_done.html +++ b/lms/templates/registration/password_reset_done.html @@ -1,3 +1,8 @@ -

Password reset successful

+
+

Password reset successful

+
+
-

We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly.

+
+

We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly.

+
diff --git a/lms/templates/signup_modal.html b/lms/templates/signup_modal.html index d22dc8e9a0..2fa0ab062b 100644 --- a/lms/templates/signup_modal.html +++ b/lms/templates/signup_modal.html @@ -36,26 +36,6 @@ Honor Code - -