Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11046 from edx/merge-release-into-master

Browse Source 
Merge release into master
This commit is contained in:
Peter Fogg
2015-12-22 09:11:43 -05:00
parent 2bf25b2f51 39de6e828f
commit 72ed155c8a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/djangoapps/support/tests/test_views.py
View File

@@ -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):

2
lms/static/sass/views/_support.scss
View File

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