Merge remote-tracking branch 'origin/release' into merge-release-into-master

lms/djangoapps/support/tests/test_views.py

@@ -18,9 +18,8 @@ from lms.djangoapps.verify_student.models import VerificationDeadline
 from student.models import CourseEnrollment, ManualEnrollmentAudit, ENROLLED_TO_ENROLLED
 from student.roles import GlobalStaff, SupportStaffRole
 from student.tests.factories import UserFactory, CourseEnrollmentFactory
-from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase, SharedModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 
 
 class SupportViewTestCase(ModuleStoreTestCase):

lms/static/sass/views/_support.scss

@@ -3,10 +3,12 @@
 // ===================================================================
 
 .certificates-search, .enrollment-search {
+  
   margin: 40px 0;
   input[name="query"] {
     width: 350px;
   }
+
   .certificates-form {
     max-width: 850px;
     margin: 0 auto;