diff --git a/frontend/static/css/fic.css b/frontend/static/css/fic.css index 2f9a7d81..081f0c84 100644 --- a/frontend/static/css/fic.css +++ b/frontend/static/css/fic.css @@ -15,7 +15,6 @@ body { } .navbar #clock { font-size: 70px; - text-align: center; } .point, .expired { transition: color text-shadow 1s; diff --git a/frontend/static/index.html b/frontend/static/index.html index 84c638b4..964d927a 100644 --- a/frontend/static/index.html +++ b/frontend/static/index.html @@ -46,7 +46,7 @@ Epita -
+
{{ time.hours | time }} : {{ time.minutes | time }} @@ -107,7 +107,7 @@
diff --git a/frontend/static/js/challenge.js b/frontend/static/js/challenge.js index 6b5d21ee..2dbad794 100644 --- a/frontend/static/js/challenge.js +++ b/frontend/static/js/challenge.js @@ -30,14 +30,12 @@ angular.module("FICApp", ["ngRoute", "ngSanitize"]) }); $locationProvider.html5Mode(true); }) - .run(function($rootScope, $timeout) { + .run(function($rootScope, $interval) { $rootScope.current_theme = 0; $rootScope.current_exercice = 0; $rootScope.time = {}; function updTime() { - $timeout.cancel($rootScope.cbm); - $rootScope.cbm = $timeout(updTime, 1000); if (sessionStorage.userService) { var time = angular.fromJson(sessionStorage.userService); var srv_cur = (Date.now() + (time.cu * 1000 - time.he)) / 1000; @@ -68,6 +66,7 @@ angular.module("FICApp", ["ngRoute", "ngSanitize"]) } } updTime(); + $interval(updTime, 1000); }) .controller("DataController", function($sce, $scope, $http, $rootScope, $timeout) { var actMenu = function() { diff --git a/frontend/static/public.html b/frontend/static/public.html index f3c5411f..b805d76c 100644 --- a/frontend/static/public.html +++ b/frontend/static/public.html @@ -20,7 +20,7 @@ - + -