Merge branch 'master' into gh-pages

This commit is contained in:
Gabriele Cirulli
2014-03-23 20:22:41 +01:00
2 changed files with 3 additions and 0 deletions
+2
View File
@@ -148,6 +148,7 @@ hr {
-moz-user-select: none;
-ms-user-select: none;
-ms-touch-action: none;
touch-action: none;
background: #bbada0;
border-radius: 6px;
width: 500px;
@@ -560,6 +561,7 @@ hr {
-moz-user-select: none;
-ms-user-select: none;
-ms-touch-action: none;
touch-action: none;
background: #bbada0;
border-radius: 6px;
width: 280px;
+1
View File
@@ -183,6 +183,7 @@ hr {
-ms-user-select: none;
-ms-touch-action: none;
touch-action: none;
background: $game-container-background;
border-radius: $tile-border-radius * 2;