From 0d4894d709ee11181c94c0a0bb8e6e8b29451947 Mon Sep 17 00:00:00 2001 From: alexandre-pereira Date: Sun, 22 Mar 2015 16:49:58 +0100 Subject: [PATCH] Fixes --- SRC/public/css/frontend.css | 5 ++++- SRC/public/js/fire-work.js | 12 +++++++----- SRC/resources/views/frontend/memo.blade.php | 5 +++-- SRC/resources/views/frontend/puzzle.blade.php | 3 +-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/SRC/public/css/frontend.css b/SRC/public/css/frontend.css index 8e02e7c..e4c49d9 100755 --- a/SRC/public/css/frontend.css +++ b/SRC/public/css/frontend.css @@ -3,7 +3,10 @@ margin: 0; box-sizing: border-box; } - +html, body { + width: 100%; + height: 100%; +} body { font-family: 'Oswald', sans-serif; diff --git a/SRC/public/js/fire-work.js b/SRC/public/js/fire-work.js index 2d2d738..2682f39 100644 --- a/SRC/public/js/fire-work.js +++ b/SRC/public/js/fire-work.js @@ -247,8 +247,10 @@ Rocket.prototype.render = function(c) { }; -document.body.appendChild(canvas); -canvas.width = SCREEN_WIDTH; -canvas.height = SCREEN_HEIGHT; -setInterval(launch, 800); -setInterval(loop, 1000 / 50); +// init + document.body.appendChild(canvas); + canvas.width = SCREEN_WIDTH; + canvas.height = SCREEN_HEIGHT; + setInterval(launch, 800); + setInterval(loop, 1000 / 50); +}); \ No newline at end of file diff --git a/SRC/resources/views/frontend/memo.blade.php b/SRC/resources/views/frontend/memo.blade.php index 6ea9fcf..b737434 100755 --- a/SRC/resources/views/frontend/memo.blade.php +++ b/SRC/resources/views/frontend/memo.blade.php @@ -30,8 +30,9 @@ cards2.push( { id : '{{$o->id}}', - img : 'http://www.augustins.org/documents/10180/156407/{{ $o->image}}'} - ); + img : 'http://www.augustins.org/documents/10180/156407/{{ $o->image}}' + } + ); @endforeach var myMem = new Memory({ diff --git a/SRC/resources/views/frontend/puzzle.blade.php b/SRC/resources/views/frontend/puzzle.blade.php index eaf7ed2..8c220a8 100755 --- a/SRC/resources/views/frontend/puzzle.blade.php +++ b/SRC/resources/views/frontend/puzzle.blade.php @@ -117,7 +117,6 @@ this.physics.startSystem(Phaser.Physics.ARCADE); createPiecesFor(1); - drawGrid(1); dateDebut = new Date(); } function changePage() { @@ -244,7 +243,7 @@ if (r.readyState != 4 || r.status != 200) return; setTimeout(function(){ location.href = "{{URL::to('puzzle/jouer')}}" + "/" + trophy; - }, 3000); + }, 6000); }; r.send();