From c6e8ef010b84afcdad963c2694fd1f9e6f476b37 Mon Sep 17 00:00:00 2001 From: Chris Rodriguez Date: Fri, 29 May 2015 10:06:41 -0400 Subject: [PATCH 1/4] Reducing size of error message heading --- lms/static/sass/views/_login-register.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/static/sass/views/_login-register.scss b/lms/static/sass/views/_login-register.scss index 6565bd8c8c..93e94a686c 100644 --- a/lms/static/sass/views/_login-register.scss +++ b/lms/static/sass/views/_login-register.scss @@ -456,7 +456,7 @@ $sm-btn-linkedin: #0077b5; background: tint($yellow,20%); .message-title { - @extend %t-title4; + @extend %t-title5; font-family: $sans-serif; margin: 0 0 ($baseline/4) 0; font-weight: 600; From 9af7cb9b97f2eed8069fe68471379a472b1d0d84 Mon Sep 17 00:00:00 2001 From: Chris Rodriguez Date: Wed, 3 Jun 2015 12:55:41 -0400 Subject: [PATCH 2/4] Removing uppercase requirement --- lms/static/sass/views/_login-register.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/lms/static/sass/views/_login-register.scss b/lms/static/sass/views/_login-register.scss index 93e94a686c..d59523635e 100644 --- a/lms/static/sass/views/_login-register.scss +++ b/lms/static/sass/views/_login-register.scss @@ -460,7 +460,6 @@ $sm-btn-linkedin: #0077b5; font-family: $sans-serif; margin: 0 0 ($baseline/4) 0; font-weight: 600; - text-transform: uppercase; } .message-copy, From 4fd1ebce1cfcdfcc81841a4a0d5e7fc2914e59fd Mon Sep 17 00:00:00 2001 From: Chris Rodriguez Date: Mon, 8 Jun 2015 14:55:56 -0400 Subject: [PATCH 3/4] Fixing test to match CSS --- common/test/acceptance/tests/lms/test_lms.py | 2 +- .../instructor_dashboard_2/instructor_dashboard_2.html | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/common/test/acceptance/tests/lms/test_lms.py b/common/test/acceptance/tests/lms/test_lms.py index 94e2829b29..f2faded951 100644 --- a/common/test/acceptance/tests/lms/test_lms.py +++ b/common/test/acceptance/tests/lms/test_lms.py @@ -116,7 +116,7 @@ class LoginFromCombinedPageTest(UniqueCourseTest): self.login_page.visit().password_reset(email=email) # Expect that we're shown a success message - self.assertIn("PASSWORD RESET EMAIL SENT", self.login_page.wait_for_success()) + self.assertIn("Password Reset Email Sent", self.login_page.wait_for_success()) def test_password_reset_failure(self): # Navigate to the password reset form diff --git a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html index ca7c8d0246..8cf87e56d3 100644 --- a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html +++ b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html @@ -4,6 +4,10 @@ from django.utils.translation import ugettext as _ from django.core.urlresolvers import reverse %> +<<<<<<< Updated upstream +======= +<%block name="bodyclass">view-incourse view-instructordash +>>>>>>> Stashed changes ## ----- Tips on adding something to the new instructor dashboard ----- ## 1. add your input element, e.g. in instructor_dashboard2/data_download.html From 402c3f329fcf68da9222520b6a15edf49771ead7 Mon Sep 17 00:00:00 2001 From: Chris Rodriguez Date: Mon, 8 Jun 2015 14:59:17 -0400 Subject: [PATCH 4/4] Removing conflict from header --- .../instructor_dashboard_2/instructor_dashboard_2.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html index 8cf87e56d3..4aa1dec037 100644 --- a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html +++ b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html @@ -4,10 +4,7 @@ from django.utils.translation import ugettext as _ from django.core.urlresolvers import reverse %> -<<<<<<< Updated upstream -======= <%block name="bodyclass">view-incourse view-instructordash ->>>>>>> Stashed changes ## ----- Tips on adding something to the new instructor dashboard ----- ## 1. add your input element, e.g. in instructor_dashboard2/data_download.html