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

Merge pull request #15641 from jspayd/toggle-timer-upstream

Browse Source 
Toggle timer visibility on timed exams
This commit is contained in:
George Song
2017-08-28 18:39:41 -04:00
committed by GitHub
parent 0495d70b46 ab8717edbf
commit 0c204e3520
2 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,9 +88,6 @@
}
.pull-right {
color: $gray-l3;
b {
color: $white;
}
.exam-button-turn-in-exam {
background-color: transparent;
@@ -103,6 +100,26 @@
color: $action-primary-bg;
}
}
.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;
}
}
}
}
}
&.warning {
@@ -128,5 +145,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;
}
}
}
}
}

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>