Css arrangement for color clock exercise refs CT#8242

1.10.x
Alex Aragon 9 years ago
parent 432f771fd8
commit dc02b10eda
  1. 14
      app/Resources/public/css/base.css
  2. 4
      main/inc/lib/javascript/epiclock/renderers/minute/epiclock.minute.js

@ -2124,7 +2124,7 @@ div.admin_section h4 {
/* padding:5px; */
}
/* Exercise clock*/
.count_down {
.count_down{
padding: 3px;
font-size:20px;
font-weight:bold;
@ -2139,13 +2139,15 @@ div.admin_section h4 {
.count_down.navbar-fixed-top{
border-radius: 0px;
}
.time_container_warning {
.time_warning_two {
background: url(../../main/img/clock-exercise.png) no-repeat center center #FFD700;
border:1px solid #B8860B;
border:1px solid #FFCC00;
color: #C00;
}
.red_alert {
color:red;
font-weight: bold;
.time_warning_one {
background: url(../../main/img/clock-exercise.png) no-repeat center center #FB3A35;
border:1px solid #FB3A35;
color: #FFF;
}
#question_feedback {
-webkit-border-radius: 10px;

@ -28,13 +28,13 @@
var div_clock = $('#exercise_clock_warning');
// 60000 = 60 seconds
if (dist <= 180000) { //3min
if (dist <= 300000) { //5min
if (!(div_clock.hasClass('time_warning_two'))) {
div_clock.addClass('time_warning_two');
}
}
if (dist <= 60000) { //1min
if (dist <= 120000) { //2min
div_clock.removeClass('time_warning_two');
if (!(div_clock.hasClass('time_warning_one'))) {
div_clock.addClass('time_warning_one');

Loading…
Cancel
Save