Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
0c204e35
Commit
0c204e35
authored
Aug 28, 2017
by
George Song
Committed by
GitHub
Aug 28, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #15641 from jspayd/toggle-timer-upstream
Toggle timer visibility on timed exams
parents
0495d70b
ab8717ed
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
50 additions
and
6 deletions
+50
-6
lms/static/sass/course/layout/_courseware_preview.scss
+42
-3
lms/templates/courseware/proctored-exam-status.underscore
+8
-3
No files found.
lms/static/sass/course/layout/_courseware_preview.scss
View file @
0c204e35
...
...
@@ -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
;
}
}
}
}
}
lms/templates/courseware/proctored-exam-status.underscore
View file @
0c204e35
...
...
@@ -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>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment