fixed css clock CT#8024

chamilo · Mar 29, 2016 · d46b5c1 · d46b5c1
1 parent cbe3cc6
commit d46b5c1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 24 deletions.
diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css
@@ -2043,7 +2043,6 @@ div.admin_section h4 {
     float: left;
 }
 
-
 .ribbon .rib-success, .ribbon .ribbon-total-success{
     background-color: #768E00;
     background-image: -ms-linear-gradient(top, #9CB80A, #768E00);
@@ -2106,11 +2105,6 @@ div.admin_section h4 {
 .ribbon .rib::before {left: 0;}
 .ribbon .rib::after {right: 0;}
 
-
-.ribbon .success {
-
-}
-
 .ribbon .error {
     color: red;
 }
@@ -2129,28 +2123,30 @@ div.admin_section h4 {
 .exercise_save_now_button, .exercise_button{
     /* padding:5px; */
 }
-
-.time_container_warning {
-    background-color:#FFD700;
-    border:1px solid #B8860B;
-}
-
 /* Exercise clock*/
 .count_down {
     padding: 3px;
-    font-size:22px;
+    font-size:20px;
     font-weight:bold;
-    color:#222;
-    padding: 12px;
+    color:#2E75A3;
+    padding: 5px;
     text-align: center;
-    width:200px;
+    margin-bottom: 10px;
+    background: url(../../main/img/clock-exercise.png) no-repeat center center #FFF;
+    border: 1px solid #DDD;
+    border-radius: 5px;
+}
+.count_down.navbar-fixed-top{
+    border-radius: 0px;
+}
+.time_container_warning {
+    background: url(../../main/img/clock-exercise.png) no-repeat center center #FFD700;
+    border:1px solid #B8860B;
 }
-
 .red_alert {
     color:red;
     font-weight: bold;
 }
-
 #question_feedback {
     -webkit-border-radius: 10px;
     -moz-border-radius: 10px;
@@ -2165,7 +2161,6 @@ div.admin_section h4 {
     margin-top:5px;
     padding:5px;
 }
-
 .userportal-order-courses-link {
     background-color: #F9F9F9;
     border-radius: 10px 10px 10px 10px;

diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php
@@ -5016,8 +5016,8 @@ function return_time_left_div()
             get_lang('YouWillBeRedirectedInXSeconds'),
             '<span id="counter_to_redirect" class="red_alert"></span>'
         );
-        $html .= '</div>';
-        $html .= '<div id="exercise_clock_warning" class="well count_down"></div>';
+        $html .= '</div>'; 
+        $html .= '<div id="exercise_clock_warning" class="count_down"></div>';
         return $html;
     }
 

diff --git a/main/template/default/layout/header.js.tpl b/main/template/default/layout/header.js.tpl
@@ -232,11 +232,11 @@ $(document).scroll(function() {
         }
 
         if (fixed.attr('data-top') - fixed.outerHeight() <= $(this).scrollTop()) {
-            fixed.addClass('subnav-fixed');
+            fixed.addClass('navbar-fixed-top');
             fixed.css('width', '100%');
         } else {
-            fixed.removeClass('subnav-fixed');
-            fixed.css('width', '200px');
+            fixed.removeClass('navbar-fixed-top');
+            fixed.css('width', '100%');
         }
     }