merge master & readd ga

This commit is contained in:
Gabriele Cirulli
2014-03-10 11:33:06 +01:00
7 changed files with 115 additions and 53 deletions
+26 -14
View File
@@ -94,7 +94,8 @@ p {
a {
color: #776e65;
font-weight: bold;
text-decoration: underline; }
text-decoration: underline;
cursor: pointer; }
strong.important {
text-transform: uppercase; }
@@ -143,30 +144,41 @@ hr {
width: 500px;
height: 500px;
box-sizing: border-box; }
.game-container.game-over:after, .game-container.game-won:after {
.game-container .game-message {
display: none;
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
display: block;
background: rgba(238, 228, 218, 0.5);
text-align: center;
height: 500px;
line-height: 500px;
z-index: 100;
font-size: 60px;
font-weight: bold;
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-over:after {
content: "Game over!"; }
.game-container.game-won:after {
content: "You win!";
background: rgba(237, 194, 46, 0.5);
color: #f9f6f2; }
.game-container .game-message p {
font-size: 60px;
font-weight: bold;
height: 60px;
line-height: 60px;
margin-top: 222px; }
.game-container .game-message a {
display: inline-block;
background: #a69382;
border-radius: 3px;
padding: 0 20px;
text-decoration: none;
color: #f9f6f2;
height: 40px;
line-height: 42px;
margin-top: 59px; }
.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;
+42 -24
View File
@@ -110,6 +110,7 @@ a {
color: $text-color;
font-weight: bold;
text-decoration: underline;
cursor: pointer;
}
strong {
@@ -156,35 +157,52 @@ hr {
height: $field-width;
box-sizing: border-box;
&.game-over, &.game-won {
&:after {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
display: block;
background: rgba($tile-color, .5);
text-align: center;
height: $field-width;
line-height: $field-width;
z-index: 100;
.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;
@include animation(fade-in 800ms ease $transition-speed * 12);
@include animation-fill-mode(both);
height: 60px;
line-height: 60px;
margin-top: 222px;
// height: $field-width;
// line-height: $field-width;
}
}
&.game-over:after {
content: "Game over!";
}
a {
display: inline-block;
background: darken($game-container-background, 10%);
border-radius: 3px;
padding: 0 20px;
text-decoration: none;
color: $bright-text-color;
height: 40px;
line-height: 42px;
margin-top: 59px;
}
&.game-won:after {
content: "You win!";
background: rgba($tile-gold-color, .5);
color: $bright-text-color;
@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;
}
}
}