diff --git a/lms/static/sass/course/layout/_courseware_preview.scss b/lms/static/sass/course/layout/_courseware_preview.scss
index 35a2d1f6a7..1a46f68be1 100644
--- a/lms/static/sass/course/layout/_courseware_preview.scss
+++ b/lms/static/sass/course/layout/_courseware_preview.scss
@@ -122,6 +122,26 @@
color: theme-color("brand");
}
}
+ .exam-timer-clock {
+ background-color: transparent;
+ border: 1px solid $white;
+ #toggle_timer, b {
+ color: $white;
+ }
+ #toggle_timer {
+ border-top: none;
+ border-right: none;
+ border-bottom: none;
+ border-top-right-radius: 2px;
+ border-bottom-right-radius: 2px;
+
+ &:hover {
+ border-top: none;
+ border-right: none;
+ border-bottom: none;
+ }
+ }
+ }
}
}
@@ -151,5 +171,27 @@
border: 0;
}
}
+ .exam-timer-clock {
+ display: inline-block;
+ padding: 0 0 0 ($baseline/3);
+ background-color: theme-color("light");
+ border-radius: 3px;
+
+ #toggle_timer {
+ @extend .exam-button-turn-in-exam;
+
+ padding: ($baseline/5) ($baseline/3);
+ border-bottom-left-radius: 0;
+ border-top-left-radius: 0;
+ margin-right: 0;
+ }
+ b {
+ padding-right: ($baseline/5);
+
+ &.timer-hidden {
+ visibility: hidden;
+ }
+ }
+ }
}
}
diff --git a/lms/templates/courseware/proctored-exam-status.underscore b/lms/templates/courseware/proctored-exam-status.underscore
index 68fd212247..301223673a 100644
--- a/lms/templates/courseware/proctored-exam-status.underscore
+++ b/lms/templates/courseware/proctored-exam-status.underscore
@@ -19,9 +19,14 @@
<% } %>
-
-
-
+
+
+
+
+
+
diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
index 35e532a92b..7f148f7381 100644
--- a/requirements/edx/github.txt
+++ b/requirements/edx/github.txt
@@ -100,7 +100,7 @@ git+https://github.com/edx/xblock-utils.git@v1.0.5#egg=xblock-utils==1.0.5
-e git+https://github.com/edx-solutions/xblock-google-drive.git@138e6fa0bf3a2013e904a085b9fed77dab7f3f21#egg=xblock-google-drive
git+https://github.com/edx/edx-user-state-client.git@1.0.1#egg=edx-user-state-client==1.0.1
git+https://github.com/edx/xblock-lti-consumer.git@v1.1.6#egg=lti_consumer-xblock==1.1.6
-git+https://github.com/edx/edx-proctoring.git@1.2.3#egg=edx-proctoring==1.2.3
+git+https://github.com/edx/edx-proctoring.git@1.3.0#egg=edx-proctoring==1.3.0
# Third Party XBlocks