Impaczus/2048
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into gh-pages

Browse Source
This commit is contained in:
Gabriele Cirulli
2014-03-10 18:04:14 +01:00
parent aaebb037d2 433127cd93
commit 9d48120a14
3 changed files with 59 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
style/main.css
+32 -15
View File
@@ -143,6 +143,8 @@ hr {
border-radius: 6px;
width: 500px;
height: 500px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box; }
.game-container .game-message {
display: none;
@@ -340,29 +342,35 @@ hr {
@-webkit-keyframes appear {
0% {
opacity: 0;
-webkit-transform: scale(0); }
-webkit-transform: scale(0);
-moz-transform: scale(0); }
100% {
opacity: 1;
-webkit-transform: scale(1); } }
-webkit-transform: scale(1);
-moz-transform: scale(1); } }
@-moz-keyframes appear {
0% {
opacity: 0;
-webkit-transform: scale(0); }
-webkit-transform: scale(0);
-moz-transform: scale(0); }
100% {
opacity: 1;
-webkit-transform: scale(1); } }
-webkit-transform: scale(1);
-moz-transform: scale(1); } }
@keyframes appear {
0% {
opacity: 0;
-webkit-transform: scale(0); }
-webkit-transform: scale(0);
-moz-transform: scale(0); }
100% {
opacity: 1;
-webkit-transform: scale(1); } }
-webkit-transform: scale(1);
-moz-transform: scale(1); } }
.tile-new {
-webkit-animation: appear 200ms ease 100ms;
@@ -372,33 +380,42 @@ hr {
@-webkit-keyframes pop {
0% {
-webkit-transform: scale(0); }
-webkit-transform: scale(0);
-moz-transform: scale(0); }
50% {
-webkit-transform: scale(1.2); }
-webkit-transform: scale(1.2);
-moz-transform: scale(1.2); }
100% {
-webkit-transform: scale(1); } }
-webkit-transform: scale(1);
-moz-transform: scale(1); } }
@-moz-keyframes pop {
0% {
-webkit-transform: scale(0); }
-webkit-transform: scale(0);
-moz-transform: scale(0); }
50% {
-webkit-transform: scale(1.2); }
-webkit-transform: scale(1.2);
-moz-transform: scale(1.2); }
100% {
-webkit-transform: scale(1); } }
-webkit-transform: scale(1);
-moz-transform: scale(1); } }
@keyframes pop {
0% {
-webkit-transform: scale(0); }
-webkit-transform: scale(0);
-moz-transform: scale(0); }
50% {
-webkit-transform: scale(1.2); }
-webkit-transform: scale(1.2);
-moz-transform: scale(1.2); }
100% {
-webkit-transform: scale(1); } }
-webkit-transform: scale(1);
-moz-transform: scale(1); } }
.tile-merged {
z-index: 20;