update rendered stylesheet
update rendered stylesheet

file:a/README.md -> file:b/README.md
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # 2048
 A small clone of [1024](https://play.google.com/store/apps/details?id=com.veewo.a1024), based on [Saming's 2048](saming.fr/p/2048/) (also a clone).
 
-Made just for fun.
+Made just for fun. [Play it here!](http://gabrielecirulli.github.io/2048/)
 
-[![Screenshot](http://pictures.gabrielecirulli.com/2048-20140305-231246.png)](http://pictures.gabrielecirulli.com/2048-20140305-231246.png)
+[![Screenshot](http://pictures.gabrielecirulli.com/2048-20140309-234100.png)](http://pictures.gabrielecirulli.com/2048-20140309-234100.png)
 

file:a/index.html -> file:b/index.html
--- a/index.html
+++ b/index.html
@@ -15,10 +15,20 @@
 </head>
 <body>
   <div class="container">
-    <h1>2048</h1>
+    <div class="heading">
+      <h1 class="title">2048</h1>
+      <div class="score-container">0</div>
+    </div>
     <p class="game-intro">Join the numbers and get to the <strong>2048 tile!</strong></p>
 
     <div class="game-container">
+      <div class="game-message">
+        <p></p>
+        <div class="lower">
+          <a class="retry-button">Try again</a>
+        </div>
+      </div>
+
       <div class="grid-container">
         <div class="grid-row">
           <div class="grid-cell"></div>

--- a/js/application.js
+++ b/js/application.js
@@ -1,5 +1,7 @@
-// Wait till the browser is ready to render the game (avoids glitches)
-window.requestAnimationFrame(function () {
-  var manager = new GameManager(4, KeyboardInputManager, HTMLActuator);
+document.addEventListener("DOMContentLoaded", function () {
+  // Wait till the browser is ready to render the game (avoids glitches)
+  window.requestAnimationFrame(function () {
+    var manager = new GameManager(4, KeyboardInputManager, HTMLActuator);
+  });
 });
 

--- a/js/game_manager.js
+++ b/js/game_manager.js
@@ -4,15 +4,28 @@
   this.actuator     = new Actuator;
 
   this.startTiles   = 2;
-  this.grid         = new Grid(this.size);
 
   this.inputManager.on("move", this.move.bind(this));
+  this.inputManager.on("restart", this.restart.bind(this));
 
   this.setup();
 }
 
+// Restart the game
+GameManager.prototype.restart = function () {
+  this.actuator.restart();
+  this.setup();
+};
+
 // Set up the game
 GameManager.prototype.setup = function () {
+  this.grid         = new Grid(this.size);
+
+  this.score        = 0;
+  this.over         = false;
+  this.won          = false;
+
+  // Add the initial tiles
   this.addStartTiles();
 
   // Update the actuator
@@ -38,13 +51,18 @@
 
 // Sends the updated grid to the actuator
 GameManager.prototype.actuate = function () {
-  this.actuator.actuate(this.grid);
-};
-
-// Saves all the current tile positions
-GameManager.prototype.saveTilePositions = function () {
+  this.actuator.actuate(this.grid, {
+    score: this.score,
+    over:  this.over,
+    won:   this.won
+  });
+};
+
+// Save all tile positions and remove merger info
+GameManager.prototype.prepareTiles = function () {
   this.grid.eachCell(function (x, y, tile) {
     if (tile) {
+      tile.mergedFrom = null;
       tile.savePosition();
     }
   });
@@ -54,8 +72,7 @@
 GameManager.prototype.moveTile = function (tile, cell) {
   this.grid.cells[tile.x][tile.y] = null;
   this.grid.cells[cell.x][cell.y] = tile;
-  tile.x = cell.x;
-  tile.y = cell.y;
+  tile.updatePosition(cell);
 };
 
 // Move tiles on the grid in the specified direction
@@ -63,13 +80,16 @@
   // 0: up, 1: right, 2:down, 3: left
   var self = this;
 
+  if (this.over || this.won) return; // Don't do anything if the game's over
+
   var cell, tile;
 
   var vector     = this.getVector(direction);
   var traversals = this.buildTraversals(vector);
-
-  // Save the current tile positions (for actuator awareness)
-  this.saveTilePositions();
+  var moved      = false;
+
+  // Save the current tile positions and remove merger information
+  this.prepareTiles();
 
   // Traverse the grid in the right direction and move tiles
   traversals.x.forEach(function (x) {
@@ -78,16 +98,45 @@
       tile = self.grid.cellContent(cell);
 
       if (tile) {
-        var pos = self.findFarthestPosition(cell, vector);
-        console.log(pos);
-        self.moveTile(tile, pos);
+        var positions = self.findFarthestPosition(cell, vector);
+        var next      = self.grid.cellContent(positions.next);
+
+        // Only one merger per row traversal?
+        if (next && next.value === tile.value && !next.mergedFrom) {
+          var merged = new Tile(positions.next, tile.value * 2);
+          merged.mergedFrom = [tile, next];
+
+          self.grid.insertTile(merged);
+          self.grid.removeTile(tile);
+
+          // Converge the two tiles' positions
+          tile.updatePosition(positions.next);
+
+          // Update the score
+          self.score += merged.value;
+
+          // The mighty 2048 tile
+          if (merged.value === 2048) self.won = true;
+        } else {
+          self.moveTile(tile, positions.farthest);
+        }
+
+        if (!self.positionsEqual(cell, tile)) {
+          moved = true; // The tile moved from its original cell!
+        }
       }
     });
   });
 
-  this.addRandomTile();
-  console.log(16 - this.grid.availableCells().length);
-  this.actuate();
+  if (moved) {
+    this.addRandomTile();
+
+    if (!this.movesAvailable()) {
+      this.over = true; // Game over!
+    }
+
+    this.actuate();
+  }
 };
 
 // Get the vector representing the chosen direction
@@ -126,10 +175,50 @@
   do {
     previous = cell;
     cell     = { x: previous.x + vector.x, y: previous.y + vector.y };
-  } while (cell.x >= 0 && cell.x < this.size &&
-           cell.y >= 0 && cell.y < this.size &&
+  } while (this.grid.withinBounds(cell) &&
            this.grid.cellAvailable(cell));
 
-  return previous;
-};
-
+  return {
+    farthest: previous,
+    next: cell // Used to check if a merge is required
+  };
+};
+
+GameManager.prototype.movesAvailable = function () {
+  return this.grid.cellsAvailable() || this.tileMatchesAvailable();
+};
+
+// Check for available matches between tiles (more expensive check)
+GameManager.prototype.tileMatchesAvailable = function () {
+  var self = this;
+
+  var tile;
+
+  for (var x = 0; x < this.size; x++) {
+    for (var y = 0; y < this.size; y++) {
+      tile = this.grid.cellContent({ x: x, y: y });
+
+      if (tile) {
+        for (var direction = 0; direction < 4; direction++) {
+          var vector = self.getVector(direction);
+          var cell   = { x: x + vector.x, y: y + vector.y };
+
+          var other  = self.grid.cellContent(cell);
+          if (other) {
+          }
+
+          if (other && other.value === tile.value) {
+            return true; // These two tiles can be merged
+          }
+        }
+      }
+    }
+  }
+
+  return false;
+};
+
+GameManager.prototype.positionsEqual = function (first, second) {
+  return first.x === second.x && first.y === second.y;
+};
+

file:a/js/grid.js -> file:b/js/grid.js
--- a/js/grid.js
+++ b/js/grid.js
@@ -62,7 +62,11 @@
 };
 
 Grid.prototype.cellContent = function (cell) {
-  return this.cells[cell.x][cell.y];
+  if (this.withinBounds(cell)) {
+    return this.cells[cell.x][cell.y];
+  } else {
+    return null;
+  }
 };
 
 // Inserts a tile at its position
@@ -70,3 +74,12 @@
   this.cells[tile.x][tile.y] = tile;
 };
 
+Grid.prototype.removeTile = function (tile) {
+  this.cells[tile.x][tile.y] = null;
+};
+
+Grid.prototype.withinBounds = function (position) {
+  return position.x >= 0 && position.x < this.size &&
+         position.y >= 0 && position.y < this.size;
+};
+

--- a/js/html_actuator.js
+++ b/js/html_actuator.js
@@ -1,12 +1,16 @@
 function HTMLActuator() {
-  this.tileContainer = document.getElementsByClassName("tile-container")[0];
+  this.tileContainer    = document.getElementsByClassName("tile-container")[0];
+  this.scoreContainer   = document.getElementsByClassName("score-container")[0];
+  this.messageContainer = document.getElementsByClassName("game-message")[0];
+
+  this.score = 0;
 }
 
-HTMLActuator.prototype.actuate = function (grid) {
+HTMLActuator.prototype.actuate = function (grid, metadata) {
   var self = this;
 
   window.requestAnimationFrame(function () {
-    self.clearContainer();
+    self.clearContainer(self.tileContainer);
 
     grid.cells.forEach(function (column) {
       column.forEach(function (cell) {
@@ -15,12 +19,21 @@
         }
       });
     });
+
+    self.updateScore(metadata.score);
+
+    if (metadata.over) self.message(false); // You lose
+    if (metadata.won) self.message(true); // You win!
   });
 };
 
-HTMLActuator.prototype.clearContainer = function () {
-  while (this.tileContainer.firstChild) {
-    this.tileContainer.removeChild(this.tileContainer.firstChild);
+HTMLActuator.prototype.restart = function () {
+  this.clearMessage();
+};
+
+HTMLActuator.prototype.clearContainer = function (container) {
+  while (container.firstChild) {
+    container.removeChild(container.firstChild);
   }
 };
 
@@ -36,17 +49,19 @@
 
   this.tileContainer.appendChild(element);
 
-
   if (tile.previousPosition) {
     window.requestAnimationFrame(function () {
-      // console.log( + " === " + positionClass);
       element.classList.remove(element.classList[2]);
       element.classList.add(self.positionClass({ x: tile.x, y: tile.y }));
+    });
+  } else if (tile.mergedFrom) {
+    element.classList.add("tile-merged");
+    tile.mergedFrom.forEach(function (merged) {
+      self.addTile(merged);
     });
   } else {
     element.classList.add("tile-new");
   }
-
 };
 
 HTMLActuator.prototype.normalizePosition = function (position) {
@@ -58,3 +73,32 @@
   return "tile-position-" + position.x + "-" + position.y;
 };
 
+HTMLActuator.prototype.updateScore = function (score) {
+  this.clearContainer(this.scoreContainer);
+
+  var difference = score - this.score;
+  this.score = score;
+
+  this.scoreContainer.textContent = this.score;
+
+  if (difference > 0) {
+    var addition = document.createElement("div");
+    addition.classList.add("score-addition");
+    addition.textContent = "+" + difference;
+
+    this.scoreContainer.appendChild(addition);
+  }
+};
+
+HTMLActuator.prototype.message = function (won) {
+  var type    = won ? "game-won" : "game-over";
+  var message = won ? "You win!" : "Game over!"
+
+  this.messageContainer.classList.add(type);
+  this.messageContainer.getElementsByTagName("p")[0].textContent = message;
+};
+
+HTMLActuator.prototype.clearMessage = function () {
+  this.messageContainer.classList.remove("game-won", "game-over");
+};
+

--- a/js/keyboard_input_manager.js
+++ b/js/keyboard_input_manager.js
@@ -40,5 +40,11 @@
       self.emit("move", mapped);
     }
   });
+
+  var retry = document.getElementsByClassName("retry-button")[0];
+  retry.addEventListener("click", function (event) {
+    event.preventDefault();
+    self.emit("restart");
+  });
 };
 

file:a/js/tile.js -> file:b/js/tile.js
--- a/js/tile.js
+++ b/js/tile.js
@@ -4,9 +4,15 @@
   this.value            = value || 2;
 
   this.previousPosition = null;
+  this.mergedFrom       = null; // Tracks tiles that merged together
 }
 
 Tile.prototype.savePosition = function () {
   this.previousPosition = { x: this.x, y: this.y };
 };
 
+Tile.prototype.updatePosition = function (position) {
+  this.x = position.x;
+  this.y = position.y;
+};
+

--- a/style/main.css
+++ b/style/main.css
@@ -10,10 +10,81 @@
 body {
   margin: 80px 0; }
 
-h1 {
+.heading:after {
+  content: "";
+  display: block;
+  clear: both; }
+
+h1.title {
   font-size: 80px;
   font-weight: bold;
-  margin: 0; }
+  margin: 0;
+  display: block;
+  float: left; }
+
+@-webkit-keyframes move-up {
+  0% {
+    top: 25px;
+    opacity: 1; }
+
+  100% {
+    top: -50px;
+    opacity: 0; } }
+
+@-moz-keyframes move-up {
+  0% {
+    top: 25px;
+    opacity: 1; }
+
+  100% {
+    top: -50px;
+    opacity: 0; } }
+
+@keyframes move-up {
+  0% {
+    top: 25px;
+    opacity: 1; }
+
+  100% {
+    top: -50px;
+    opacity: 0; } }
+
+.score-container {
+  position: relative;
+  float: right;
+  background: #bbada0;
+  padding: 15px 25px;
+  font-size: 25px;
+  height: 25px;
+  line-height: 47px;
+  font-weight: bold;
+  border-radius: 3px;
+  color: white;
+  margin-top: 8px; }
+  .score-container:after {
+    position: absolute;
+    width: 100%;
+    top: 10px;
+    left: 0;
+    content: "Score";
+    text-transform: uppercase;
+    font-size: 13px;
+    line-height: 13px;
+    text-align: center;
+    color: #eee4da; }
+  .score-container .score-addition {
+    position: absolute;
+    right: 30px;
+    color: red;
+    font-size: 25px;
+    line-height: 25px;
+    font-weight: bold;
+    color: rgba(119, 110, 101, 0.9);
+    z-index: 100;
+    -webkit-animation: move-up 600ms ease-in;
+    -moz-animation: move-up 600ms ease-in;
+    -webkit-animation-fill-mode: both;
+    -moz-animation-fill-mode: both; }
 
 p {
   margin-top: 0;
@@ -23,7 +94,8 @@
 a {
   color: #776e65;
   font-weight: bold;
-  text-decoration: underline; }
+  text-decoration: underline;
+  cursor: pointer; }
 
 strong.important {
   text-transform: uppercase; }
@@ -37,6 +109,27 @@
 .container {
   width: 500px;
   margin: 0 auto; }
+
+@-webkit-keyframes fade-in {
+  0% {
+    opacity: 0; }
+
+  100% {
+    opacity: 1; } }
+
+@-moz-keyframes fade-in {
+  0% {
+    opacity: 0; }
+
+  100% {
+    opacity: 1; } }
+
+@keyframes fade-in {
+  0% {
+    opacity: 0; }
+
+  100% {
+    opacity: 1; } }
 
 .game-container {
   margin-top: 40px;
@@ -51,6 +144,44 @@
   width: 500px;
   height: 500px;
   box-sizing: border-box; }
+  .game-container .game-message {
+    display: none;
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    background: rgba(238, 228, 218, 0.5);
+    z-index: 100;
+    text-align: center;
+    -webkit-animation: fade-in 800ms ease 1200ms;
+    -moz-animation: fade-in 800ms ease 1200ms;
+    -webkit-animation-fill-mode: both;
+    -moz-animation-fill-mode: both; }
+    .game-container .game-message p {
+      font-size: 60px;
+      font-weight: bold;
+      height: 60px;
+      line-height: 60px;
+      margin-top: 222px; }
+    .game-container .game-message .lower {
+      display: block;
+      margin-top: 59px; }
+    .game-container .game-message a {
+      display: inline-block;
+      background: #8f7a66;
+      border-radius: 3px;
+      padding: 0 20px;
+      text-decoration: none;
+      color: #f9f6f2;
+      height: 40px;
+      line-height: 42px;
+      margin-left: 9px; }
+    .game-container .game-message.game-won {
+      background: rgba(237, 194, 46, 0.5);
+      color: #f9f6f2; }
+    .game-container .game-message.game-won, .game-container .game-message.game-over {
+      display: block; }
 
 .grid-container {
   position: absolute;
@@ -89,6 +220,7 @@
   line-height: 116.25px;
   font-size: 55px;
   font-weight: bold;
+  z-index: 10;
   -webkit-transition: 100ms ease-in-out;
   -moz-transition: 100ms ease-in-out;
   -webkit-transition-property: top, left;
@@ -100,63 +232,63 @@
   .tile.tile-position-1-2 {
     position: absolute;
     left: 0px;
-    top: 121.25px; }
+    top: 121px; }
   .tile.tile-position-1-3 {
     position: absolute;
     left: 0px;
-    top: 242.5px; }
+    top: 243px; }
   .tile.tile-position-1-4 {
     position: absolute;
     left: 0px;
-    top: 363.75px; }
+    top: 364px; }
   .tile.tile-position-2-1 {
     position: absolute;
-    left: 121.25px;
+    left: 121px;
     top: 0px; }
   .tile.tile-position-2-2 {
     position: absolute;
-    left: 121.25px;
-    top: 121.25px; }
+    left: 121px;
+    top: 121px; }
   .tile.tile-position-2-3 {
     position: absolute;
-    left: 121.25px;
-    top: 242.5px; }
+    left: 121px;
+    top: 243px; }
   .tile.tile-position-2-4 {
     position: absolute;
-    left: 121.25px;
-    top: 363.75px; }
+    left: 121px;
+    top: 364px; }
   .tile.tile-position-3-1 {
     position: absolute;
-    left: 242.5px;
+    left: 243px;
     top: 0px; }
   .tile.tile-position-3-2 {
     position: absolute;
-    left: 242.5px;
-    top: 121.25px; }
+    left: 243px;
+    top: 121px; }
   .tile.tile-position-3-3 {
     position: absolute;
-    left: 242.5px;
-    top: 242.5px; }
+    left: 243px;
+    top: 243px; }
   .tile.tile-position-3-4 {
     position: absolute;
-    left: 242.5px;
-    top: 363.75px; }
+    left: 243px;
+    top: 364px; }
   .tile.tile-position-4-1 {
     position: absolute;
-    left: 363.75px;
+    left: 364px;
     top: 0px; }
   .tile.tile-position-4-2 {
     position: absolute;
-    left: 363.75px;
-    top: 121.25px; }
+    left: 364px;
+    top: 121px; }
   .tile.tile-position-4-3 {
     position: absolute;
-    left: 363.75px;
-    top: 242.5px; }
+    left: 364px;
+    top: 243px; }
   .tile.tile-position-4-4 {
     position: absolute;
-    left: 363.75px;
-    top: 363.75px; }
+    left: 364px;
+    top: 364px; }
   .tile.tile-2 {
     background: #eee4da;
     box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0), inset 0 0 0 1px rgba(255, 255, 255, 0); }
@@ -165,20 +297,16 @@
     box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0), inset 0 0 0 1px rgba(255, 255, 255, 0); }
   .tile.tile-8 {
     color: #f9f6f2;
-    background: #f2b179;
-    box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0), inset 0 0 0 1px rgba(255, 255, 255, 0); }
+    background: #f2b179; }
   .tile.tile-16 {
     color: #f9f6f2;
-    background: #f59563;
-    box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0), inset 0 0 0 1px rgba(255, 255, 255, 0); }
+    background: #f59563; }
   .tile.tile-32 {
     color: #f9f6f2;
-    background: #f67c5f;
-    box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.07937), inset 0 0 0 1px rgba(255, 255, 255, 0.04762); }
+    background: #f67c5f; }
   .tile.tile-64 {
     color: #f9f6f2;
-    background: #f65e3b;
-    box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.15873), inset 0 0 0 1px rgba(255, 255, 255, 0.09524); }
+    background: #f65e3b; }
   .tile.tile-128 {
     color: #f9f6f2;
     background: #edcf72;
@@ -207,30 +335,30 @@
 
 @-webkit-keyframes appear {
   0% {
-    -webkit-transform: scale(1.5);
-    opacity: 0; }
-
-  100% {
-    -webkit-transform: scale(1);
-    opacity: 1; } }
+    opacity: 0;
+    -webkit-transform: scale(0); }
+
+  100% {
+    opacity: 1;
+    -webkit-transform: scale(1); } }
 
 @-moz-keyframes appear {
   0% {
-    -webkit-transform: scale(1.5);
-    opacity: 0; }
-
-  100% {
-    -webkit-transform: scale(1);
-    opacity: 1; } }
+    opacity: 0;
+    -webkit-transform: scale(0); }
+
+  100% {
+    opacity: 1;
+    -webkit-transform: scale(1); } }
 
 @keyframes appear {
   0% {
-    -webkit-transform: scale(1.5);
-    opacity: 0; }
-
-  100% {
-    -webkit-transform: scale(1);
-    opacity: 1; } }
+    opacity: 0;
+    -webkit-transform: scale(0); }
+
+  100% {
+    opacity: 1;
+    -webkit-transform: scale(1); } }
 
 .tile-new {
   -webkit-animation: appear 200ms ease 100ms;
@@ -238,6 +366,43 @@
   -webkit-animation-fill-mode: both;
   -moz-animation-fill-mode: both; }
 
+@-webkit-keyframes pop {
+  0% {
+    -webkit-transform: scale(0); }
+
+  50% {
+    -webkit-transform: scale(1.2); }
+
+  100% {
+    -webkit-transform: scale(1); } }
+
+@-moz-keyframes pop {
+  0% {
+    -webkit-transform: scale(0); }
+
+  50% {
+    -webkit-transform: scale(1.2); }
+
+  100% {
+    -webkit-transform: scale(1); } }
+
+@keyframes pop {
+  0% {
+    -webkit-transform: scale(0); }
+
+  50% {
+    -webkit-transform: scale(1.2); }
+
+  100% {
+    -webkit-transform: scale(1); } }
+
+.tile-merged {
+  z-index: 20;
+  -webkit-animation: pop 200ms ease 100ms;
+  -moz-animation: pop 200ms ease 100ms;
+  -webkit-animation-fill-mode: both;
+  -moz-animation-fill-mode: both; }
+
 .game-intro {
   margin-bottom: 0; }
 

--- a/style/main.scss
+++ b/style/main.scss
@@ -14,6 +14,8 @@
 $tile-gold-color: #edc22e;
 $tile-gold-glow-color: lighten($tile-gold-color, 15%);
 
+$game-container-background: #bbada0;
+
 $transition-speed: 100ms;
 
 html, body {
@@ -30,10 +32,72 @@
   margin: 80px 0;
 }
 
-h1 {
+.heading:after {
+  content: "";
+  display: block;
+  clear: both;
+}
+
+h1.title {
   font-size: 80px;
   font-weight: bold;
   margin: 0;
+  display: block;
+  float: left;
+}
+
+@include keyframes(move-up) {
+  0% {
+    top: 25px;
+    opacity: 1;
+  }
+
+  100% {
+    top: -50px;
+    opacity: 0;
+  }
+}
+
+.score-container {
+  $height: 25px;
+
+  position: relative;
+  float: right;
+  background: $game-container-background;
+  padding: 15px 25px;
+  font-size: $height;
+  height: $height;
+  line-height: $height + 22px;
+  font-weight: bold;
+  border-radius: 3px;
+  color: white;
+  margin-top: 8px;
+
+  &:after {
+    position: absolute;
+    width: 100%;
+    top: 10px;
+    left: 0;
+    content: "Score";
+    text-transform: uppercase;
+    font-size: 13px;
+    line-height: 13px;
+    text-align: center;
+    color: $tile-color;
+  }
+
+  .score-addition {
+    position: absolute;
+    right: 30px;
+    color: red;
+    font-size: $height;
+    line-height: $height;
+    font-weight: bold;
+    color: rgba($text-color, .9);
+    z-index: 100;
+    @include animation(move-up 600ms ease-in);
+    @include animation-fill-mode(both);
+  }
 }
 
 p {
@@ -46,6 +110,7 @@
   color: $text-color;
   font-weight: bold;
   text-decoration: underline;
+  cursor: pointer;
 }
 
 strong {
@@ -66,6 +131,16 @@
   margin: 0 auto;
 }
 
+@include keyframes(fade-in) {
+  0% {
+    opacity: 0;
+  }
+
+  100% {
+    opacity: 1;
+  }
+}
+
 .game-container {
   margin-top: 40px;
   position: relative;
@@ -76,11 +151,65 @@
   -webkit-user-select: none;
   -moz-user-select: none;
 
-  background: #bbada0;
+  background: $game-container-background;
   border-radius: $tile-border-radius * 2;
   width: $field-width;
   height: $field-width;
   box-sizing: border-box;
+
+  .game-message {
+    display: none;
+
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    background: rgba($tile-color, .5);
+    z-index: 100;
+
+    text-align: center;
+
+    p {
+      font-size: 60px;
+      font-weight: bold;
+      height: 60px;
+      line-height: 60px;
+      margin-top: 222px;
+      // height: $field-width;
+      // line-height: $field-width;
+    }
+
+    .lower {
+      display: block;
+      margin-top: 59px;
+    }
+
+    a {
+      display: inline-block;
+      background: darken($game-container-background, 20%);
+      border-radius: 3px;
+      padding: 0 20px;
+      text-decoration: none;
+      color: $bright-text-color;
+      height: 40px;
+      line-height: 42px;
+      margin-left: 9px;
+      // margin-top: 59px;
+    }
+
+    @include animation(fade-in 800ms ease $transition-speed * 12);
+    @include animation-fill-mode(both);
+
+    &.game-won {
+      background: rgba($tile-gold-color, .5);
+      color: $bright-text-color;
+    }
+
+    &.game-won, &.game-over {
+      display: block;
+    }
+  }
 }
 
 .grid-container {
@@ -133,6 +262,7 @@
   line-height: $tile-size + 10px;
   font-size: 55px;
   font-weight: bold;
+  z-index: 10;
 
   @include transition($transition-speed ease-in-out);
   @include transition-property(top, left);
@@ -142,8 +272,8 @@
     @for $y from 1 through $grid-row-cells {
       &.tile-position-#{$x}-#{$y} {
         position: absolute;
-        left: ($tile-size + $grid-spacing) * ($x - 1);
-        top: ($tile-size + $grid-spacing) * ($y - 1);
+        left: round(($tile-size + $grid-spacing) * ($x - 1));
+        top: round(($tile-size + $grid-spacing) * ($y - 1));
       }
     }
   }
@@ -192,8 +322,11 @@
 
       // Add glow
       $glow-opacity: max($exponent - 4, 0) / ($limit - 4);
-      box-shadow: 0 0 30px 10px rgba($tile-gold-glow-color, $glow-opacity / 1.8),
-                  inset 0 0 0 1px rgba(white, $glow-opacity / 3);
+
+      @if not $special-background {
+        box-shadow: 0 0 30px 10px rgba($tile-gold-glow-color, $glow-opacity / 1.8),
+                    inset 0 0 0 1px rgba(white, $glow-opacity / 3);
+      }
 
       // Adjust font size for bigger numbers
       @if $power >= 100 and $power < 1000 {
@@ -209,13 +342,15 @@
 
 @include keyframes(appear) {
   0% {
-    -webkit-transform: scale(1.5);
+    // -webkit-transform: scale(1.5);
     opacity: 0;
+    -webkit-transform: scale(0);
   }
 
   100% {
+    // -webkit-transform: scale(1);
+    opacity: 1;
     -webkit-transform: scale(1);
-    opacity: 1;
   }
 }
 
@@ -224,6 +359,28 @@
   @include animation-fill-mode(both);
 }
 
+@include keyframes(pop) {
+  0% {
+    -webkit-transform: scale(0);
+    // opacity: 0;
+  }
+
+  50% {
+    -webkit-transform: scale(1.2);
+  }
+
+  100% {
+    -webkit-transform: scale(1);
+    // opacity: 1;
+  }
+}
+
+.tile-merged {
+  z-index: 20;
+  @include animation(pop 200ms ease $transition-speed);
+  @include animation-fill-mode(both);
+}
+
 .game-intro {
   margin-bottom: 0;
 }

comments