diff --git a/SRC/public/css/memory.css b/SRC/public/css/memory.css index 338e8cf..fe9f7d0 100644 --- a/SRC/public/css/memory.css +++ b/SRC/public/css/memory.css @@ -119,6 +119,8 @@ img { list-style: none; margin: 0; padding: 0; + display: inline; + margin-top: 0; } .mg__start-screen--level-select span { color: #ff3c50; diff --git a/SRC/public/js/memory.js b/SRC/public/js/memory.js index 28bbb2c..9951477 100644 --- a/SRC/public/js/memory.js +++ b/SRC/public/js/memory.js @@ -1,16 +1,3 @@ -/** - * Memory Game - * - * This is the wrapper function for my memory game! It contains all of the core - * functionality for the game to run. - * - * Licensed under the MIT license. - * http://www.opensource.org/licenses/mit-license.php - * - * Copyright 2014, Call Me Nick - * http://callmenick.com - */ - ;(function( window ) { 'use strict'; @@ -197,6 +184,8 @@ this.flippedTiles = 0; this.chosenLevel = ""; this.numMoves = 0; + // var niveauChoisi = 0; + // if (this.chosenLevel) == "1" {niveauChoisi = '';} if(this.chosenLevel) == "2" {niveauChoisi = '';} else {niveauChoisi = '';} this.gameMetaHTML = '
\ Niveau: \ @@ -207,7 +196,7 @@ \
\
\ - \ + \
'; this.gameMeta.innerHTML = this.gameMetaHTML; this.game.appendChild(this.gameMeta); @@ -217,13 +206,15 @@ // this.gameStartScreenHTML = '

Welcome to the Memory Game!

\ -

blablabla

\

Choisir niveau

\ '; + //Memory.prototype._setupGameWrapper(1); + //this._gamePlay(); + //this._setupGame(); this.gameStartScreen.innerHTML = this.gameStartScreenHTML; this.game.appendChild(this.gameStartScreen); @@ -500,9 +491,9 @@ var self = this; if (this.options.onGameEnd() === false) { this._clearGame(); - this.gameMessages.innerHTML = '

Bravo !

\ + this.gameMessages.innerHTML = '

\

Vous avez gagné votre partie en ' + this.numMoves + ' coups.

\ - '; + '; this.game.appendChild(this.gameMessages); document.getElementById("mg__onend--restart").addEventListener( "click", function(e) { self.resetGame(); diff --git a/SRC/resources/views/app.blade.php b/SRC/resources/views/app.blade.php index b7d9fab..59c04ba 100755 --- a/SRC/resources/views/app.blade.php +++ b/SRC/resources/views/app.blade.php @@ -10,7 +10,7 @@ - +