diff --git a/lms/djangoapps/courseware/tests/test_module_render.py b/lms/djangoapps/courseware/tests/test_module_render.py index 8f8849a100..aa35e629c7 100644 --- a/lms/djangoapps/courseware/tests/test_module_render.py +++ b/lms/djangoapps/courseware/tests/test_module_render.py @@ -850,7 +850,7 @@ class TestProctoringRendering(ModuleStoreTestCase): 'honor', True, None, - 'Would you like to take "Toy Videos" as a practice proctored exam?', + 'Try a proctored exam', True ), ( @@ -871,7 +871,7 @@ class TestProctoringRendering(ModuleStoreTestCase): 'verified', False, None, - 'Would you like to take "Toy Videos" as a proctored exam?', + 'This exam is proctored', False ), ( diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss index d7dd243905..06ac2a00b2 100644 --- a/lms/static/sass/course/courseware/_courseware.scss +++ b/lms/static/sass/course/courseware/_courseware.scss @@ -136,6 +136,7 @@ div.course-wrapper { border-bottom: none; box-shadow: none; text-align: left; + width: 100%; &:hover { background-color: transparent; } @@ -181,21 +182,36 @@ div.course-wrapper { border-top: 4px solid #22B557 !important; margin: 0 auto; } + &.success-left-bar { + border-left: 4px solid #22B557 !important; + margin: 0 auto; + } &.message-top-bar { border-top: 4px solid #FAB95C !important; margin: 0 auto; } + &.message-left-bar { + border-left: 4px solid #FAB95C !important; + margin: 0 auto; + } &.failure { border-left: 4px solid #C93B34 !important; margin: 0 auto; } } + div.proctored-exam { @extend .timed-exam; .proctored-exam-message { border-top: ($baseline/10) solid rgb(207, 216, 220); padding-top: 25px; } + // specialized padding override just for the entrance page + &.entrance { + button.gated-sequence { + padding: 0 ($baseline*5) 0 ($baseline*2.5); + } + } button { background: #126F9A; color: $white; @@ -221,8 +237,7 @@ div.course-wrapper { font-size: 22px; left: 0; top: $baseline; - color: rgb(206, 216, 220) - + color: rgb(206, 216, 220); } } .start-timed-exam { @@ -241,6 +256,9 @@ div.course-wrapper { top: 50%; font-size: 30px; margin-top: -15px; + &.fa-arrow-circle-right { + top: 30%; + } } &:last-child { > .fa { @@ -248,6 +266,12 @@ div.course-wrapper { } border-bottom: none; } + &:last-child { + > .practice-exam { + color: #147ABA; + } + border-bottom: none; + } } } .proctored-exam-skip-confirm-wrapper { diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index ab747176b6..7c269c356d 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -58,7 +58,7 @@ git+https://github.com/edx/ecommerce-api-client.git@1.1.0#egg=ecommerce-api-clie -e git+https://github.com/edx/edx-user-state-client.git@30c0ad4b9f57f8d48d6943eb585ec8a9205f4469#egg=edx-user-state-client -e git+https://github.com/edx/edx-organizations.git@release-2015-08-31#egg=edx-organizations -git+https://github.com/edx/edx-proctoring.git@0.8.3#egg=edx-proctoring==0.8.3 +git+https://github.com/edx/edx-proctoring.git@0.9.6#egg=edx-proctoring==0.9.6 # Third Party XBlocks -e git+https://github.com/mitodl/edx-sga@172a90fd2738f8142c10478356b2d9ed3e55334a#egg=edx-sga