Commit 2ede2b73 by Eric Fischer Committed by Farhanah Sheets

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

This reverts commit e32615e1.
parent 8b13a8a4
...@@ -122,6 +122,26 @@ ...@@ -122,6 +122,26 @@
color: theme-color("brand"); 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 @@ ...@@ -151,5 +171,27 @@
border: 0; 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;
}
}
}
} }
} }
...@@ -19,9 +19,14 @@ ...@@ -19,9 +19,14 @@
<% } %> <% } %>
</span> </span>
<span class="sr timer-announce" aria-live="assertive"></span> <span class="sr timer-announce" aria-live="assertive"></span>
<span id="time_remaining_id"> <span class="exam-timer-clock">
<b> <span id="time_remaining_id">
</b> <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> </span>
</div> </div>
</div> </div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment