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

Merge pull request #15933 from edx/george/reinstate-pr-15641

Browse Source 
Toggle timer visibility on timed exams #15641 
https://github.com/edx/edx-platform/pull/15641
This commit is contained in:
Farhanah Sheets
2017-11-06 09:28:47 -05:00
committed by GitHub
parent 81461610da c153198928
commit 33335f7ade
3 changed files with 51 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lms/static/sass/course/layout/_courseware_preview.scss
View File

@@ -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;
}
}
}
}
}

11
lms/templates/courseware/proctored-exam-status.underscore
View File

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

2
requirements/edx/github.txt
View File

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