From 3bad8aff496869f2ed6e9f6f4564bee333bc4ab8 Mon Sep 17 00:00:00 2001 From: Etienne Brateau <etienne.brateau@ensiie.fr> Date: Fri, 8 Dec 2017 05:49:00 +0100 Subject: [PATCH] Fix de cette merde de camarade. --- 404.html | 6 +++--- 404/{oliver.png => olivier.png} | Bin src/404.js | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) rename 404/{oliver.png => olivier.png} (100%) diff --git a/404.html b/404.html index 546e299..4bd4f07 100644 --- a/404.html +++ b/404.html @@ -6,12 +6,12 @@ <title>Erreur 404</title> </head> <body> - <div class="h-100 container"> + <div class="h-100"> <div id="canvas-container" style="display: none;"> - <canvas id="canvas"></canvas> - <div style="color: #9EFD38; font-size: 20px;"> + <div style="color: #FF69B4; font-size: 30px;"> Score : <span id="score">0</span> Combo : <span id="combo">1</span> </div> + <canvas id="canvas"></canvas> </div> <div class="row text-center" id="main"> <h1 class="h1-404 text-center">Erreur 404</h1> diff --git a/404/oliver.png b/404/olivier.png similarity index 100% rename from 404/oliver.png rename to 404/olivier.png diff --git a/src/404.js b/src/404.js index d8e7aae..5415e9a 100644 --- a/src/404.js +++ b/src/404.js @@ -39,7 +39,7 @@ $(document).ready(function() { for(var i = 0; i < images_src.length; i++) { var img = new Image(); // width, height values are optional params img.src = images_src[i]; - images.push(img); + images.push(img); } }); @@ -73,13 +73,14 @@ canvas.addEventListener('click', function(event) { function resizeCanvas() { canvas.width = window.innerWidth; - canvas.height = window.innerHeight; + canvas.height = window.innerHeight - 70; /* * Your drawings need to be inside this function otherwise they will be reset when * you resize the browser window and the canvas goes will be cleared. */ - animate(); + if (running) + animate(); } function reset() { -- GitLab