merge new game button

This commit is contained in:
Gabriele Cirulli
2014-03-22 17:11:51 +01:00
13 changed files with 283 additions and 123 deletions
+9
View File
@@ -77,3 +77,12 @@
-moz-appearance: $args;
appearance: $args;
}
// Clearfix
@mixin clearfix {
&:after {
content: "";
display: block;
clear: both;
}
}
+33 -13
View File
@@ -30,7 +30,6 @@ h1.title {
100% {
top: -50px;
opacity: 0; } }
@-moz-keyframes move-up {
0% {
top: 25px;
@@ -39,7 +38,6 @@ h1.title {
100% {
top: -50px;
opacity: 0; } }
@keyframes move-up {
0% {
top: 25px;
@@ -48,7 +46,6 @@ h1.title {
100% {
top: -50px;
opacity: 0; } }
.scores-container {
float: right;
text-align: right; }
@@ -128,21 +125,18 @@ hr {
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;
position: relative;
@@ -397,7 +391,6 @@ hr {
-webkit-transform: scale(1);
-moz-transform: scale(1);
transform: scale(1); } }
@-moz-keyframes appear {
0% {
opacity: 0;
@@ -410,7 +403,6 @@ hr {
-webkit-transform: scale(1);
-moz-transform: scale(1);
transform: scale(1); } }
@keyframes appear {
0% {
opacity: 0;
@@ -423,7 +415,6 @@ hr {
-webkit-transform: scale(1);
-moz-transform: scale(1);
transform: scale(1); } }
.tile-new .tile-inner {
-webkit-animation: appear 200ms ease 100ms;
-moz-animation: appear 200ms ease 100ms;
@@ -447,7 +438,6 @@ hr {
-webkit-transform: scale(1);
-moz-transform: scale(1);
transform: scale(1); } }
@-moz-keyframes pop {
0% {
-webkit-transform: scale(0);
@@ -463,7 +453,6 @@ hr {
-webkit-transform: scale(1);
-moz-transform: scale(1);
transform: scale(1); } }
@keyframes pop {
0% {
-webkit-transform: scale(0);
@@ -479,7 +468,6 @@ hr {
-webkit-transform: scale(1);
-moz-transform: scale(1);
transform: scale(1); } }
.tile-merged .tile-inner {
z-index: 20;
-webkit-animation: pop 200ms ease 100ms;
@@ -489,8 +477,27 @@ hr {
-moz-animation-fill-mode: backwards;
animation-fill-mode: backwards; }
.above-game:after {
content: "";
display: block;
clear: both; }
.game-intro {
margin-bottom: 0; }
float: left;
line-height: 42px; }
.restart-button {
display: inline-block;
background: #8f7a66;
border-radius: 3px;
padding: 0 20px;
text-decoration: none;
color: #f9f6f2;
height: 40px;
line-height: 42px;
display: block;
text-align: center;
float: right; }
.game-explanation {
margin-top: 50px; }
@@ -526,6 +533,19 @@ hr {
.heading {
margin-bottom: 10px; }
.game-intro {
width: 55%;
display: block;
box-sizing: border-box;
line-height: 1.65; }
.restart-button {
width: 42%;
padding: 0;
display: block;
box-sizing: border-box;
margin-top: 2px; }
.game-container {
margin-top: 40px;
position: relative;
+35 -5
View File
@@ -34,10 +34,8 @@ body {
margin: 80px 0;
}
.heading:after {
content: "";
display: block;
clear: both;
.heading {
@include clearfix;
}
h1.title {
@@ -453,8 +451,24 @@ hr {
@include animation-fill-mode(backwards);
}
.above-game {
@include clearfix;
// margin-bottom: 10px;
}
.game-intro {
margin-bottom: 0;
float: left;
line-height: 42px;
// margin-bottom: 0;
}
.restart-button {
@include button;
display: block;
// width: 100px;
// margin: 10px auto 10px auto;
text-align: center;
float: right;
}
.game-explanation {
@@ -508,6 +522,22 @@ hr {
margin-bottom: 10px;
}
// Show intro and restart button side by side
.game-intro {
width: 55%;
display: block;
box-sizing: border-box;
line-height: 1.65;
}
.restart-button {
width: 42%;
padding: 0;
display: block;
box-sizing: border-box;
margin-top: 2px;
}
// Render the game field at the right width
@include game-field;