diff --git a/SRC/public/css/memory.css b/SRC/public/css/memory.css index 4095fc6..2006ef5 100644 --- a/SRC/public/css/memory.css +++ b/SRC/public/css/memory.css @@ -165,7 +165,7 @@ img { /* game__level-1 styles */ .mg__level-1 .mg__tile { width: 25%; - height: 150px; + height: 50%; } .mg__level-1 .mg__tile-1 { @@ -204,8 +204,8 @@ img { /* game__level-2 styles */ .mg__level-2 .mg__tile { width: 16.66667%; - /*height: 33.33333%;*/ - height: 150px; + height: 33.33333%; + /*height: 170px;*/ } @@ -285,7 +285,7 @@ img { /* game__level-3 styles */ .mg__level-3 .mg__tile { width: 12.5%; - height: 150px; + height: 25%; } .mg__level-3 .mg__tile-1 { diff --git a/SRC/public/js/memory.js b/SRC/public/js/memory.js index 5273a7e..0275082 100644 --- a/SRC/public/js/memory.js +++ b/SRC/public/js/memory.js @@ -143,8 +143,10 @@ this.gameWrapper = document.createElement("div"); this.gameWrapper.id = "mg__wrapper"; this.gameWrapper.className = "mg__wrapper"; + this.gameContents = document.createElement("div"); this.gameContents.id = "mg__contents"; + this.gameWrapper.appendChild(this.gameContents); this.gameMessages = document.createElement("div"); @@ -208,9 +210,9 @@ this.gameStartScreenHTML = '

Welcome to the Memory Game!

\

Choisir niveau

\ '; //Memory.prototype._setupGameWrapper(1); //this._gamePlay(); @@ -292,7 +294,7 @@ Memory.prototype._renderTiles = function() { if(this.level == 1) {this.gridX = 2; this.gridY= 2; } else if(this.level == 2) {this.gridX = 3; this.gridY= 2; } - else { this.gridX = 4; this.gridY=2 ; } + else { this.gridX = 2; this.gridY=4 ; } // this.gridY = this.gridX ; this.numTiles = this.gridX * this.gridY; //this.halfNumTiles = this.gridX; @@ -302,21 +304,25 @@ this.newCards.push(this.cards[i], this.cards[i]); } this.newCards = shuffle(this.newCards); - this.tilesHTML = '
'; + /* this.newCards.push(0, 0); + this.newCards.push(0, 0);*/ + this.tilesHTML = ''; for ( var i = 0; i < this.numTiles; i++ ) { var n = i + 1; + //this.tilesHTML += '
'; this.tilesHTML += '
\
\ \ '; this.tilesHTML +='
'; - this.tilesHTML +='
'; - /* if(this.level == 1 && n == 2){ - this.tilesHTML +=""; - }*/ + // this.tilesHTML +='
'; + /* if(this.level == 1 && n == 2){ + this.tilesHTML +=""; + }*/ + this.tilesHTML +="
"; } - this.tilesHTML +=""; + this.gameContents.innerHTML = this.tilesHTML; this.gameState = 2; this.options.onGameStart(); diff --git a/SRC/resources/views/one_referent_game.blade.php b/SRC/resources/views/one_referent_game.blade.php index 7e880da..230fccc 100755 --- a/SRC/resources/views/one_referent_game.blade.php +++ b/SRC/resources/views/one_referent_game.blade.php @@ -18,9 +18,9 @@
- +
- +