From 2ede2b7397899a345d52a74a7321ea6cb14f4358 Mon Sep 17 00:00:00 2001
From: Eric Fischer <efischer@edx.org>
Date: Mon, 23 Oct 2017 16:55:52 -0400
Subject: [PATCH 1/3] Revert "Revert "Merge pull request #15641 from
 jspayd/toggle-timer-upstream""

This reverts commit e32615e13278a3addd7694f7b71d352683435e81.
---
 .../course/layout/_courseware_preview.scss    | 42 +++++++++++++++++++
 .../proctored-exam-status.underscore          | 11 +++--
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/lms/static/sass/course/layout/_courseware_preview.scss b/lms/static/sass/course/layout/_courseware_preview.scss
index 35a2d1f6a7..97408a1136 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: $gray-l3;
+      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 @@
             <% } %>
         </span>
         <span class="sr timer-announce" aria-live="assertive"></span>
-        <span id="time_remaining_id">
-            <b>
-            </b>
+        <span class="exam-timer-clock">
+            <span id="time_remaining_id">
+                <b>
+                </b>
+            </span>
+            <button role="button" id="toggle_timer" aria-label="<%- gettext("Hide Timer") %>" aria-pressed="false">
+                <i class="fa fa-eye-slash" aria-hidden="true"></i>
+            </button>
         </span>
     </div>
 </div>

From b482fbec60f31d450ba089777b0c53dbd61b0433 Mon Sep 17 00:00:00 2001
From: Farhanah Sheets <fsheets@edx.org>
Date: Tue, 24 Oct 2017 14:24:07 -0400
Subject: [PATCH 2/3] Update to latest proctoring release
 https://github.com/edx/edx-proctoring/releases/tag/1.3.0

---
 requirements/edx/github.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
index 5a78cccbc4..f9ff381638 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
 

From c153198928c11b429824d9fbc12a93515a084432 Mon Sep 17 00:00:00 2001
From: Eric Fischer <efischer@edx.org>
Date: Thu, 2 Nov 2017 16:20:18 -0400
Subject: [PATCH 3/3] theme update

---
 lms/static/sass/course/layout/_courseware_preview.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/static/sass/course/layout/_courseware_preview.scss b/lms/static/sass/course/layout/_courseware_preview.scss
index 97408a1136..1a46f68be1 100644
--- a/lms/static/sass/course/layout/_courseware_preview.scss
+++ b/lms/static/sass/course/layout/_courseware_preview.scss
@@ -174,7 +174,7 @@
     .exam-timer-clock {
       display: inline-block;
       padding: 0 0 0 ($baseline/3);
-      background-color: $gray-l3;
+      background-color: theme-color("light");
       border-radius: 3px;
 
       #toggle_timer {