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

merge super tiles

Browse Source
This commit is contained in:
Gabriele Cirulli
2014-03-14 13:59:04 +01:00
parent b7f09a4c23 f732d4f547
commit c6d4e4f29f
7 changed files with 104 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
style/main.css
+15
View File
@@ -193,6 +193,8 @@ hr {
height: 40px;
line-height: 42px;
margin-left: 9px; }
.game-container .game-message a.keep-playing-button {
display: none; }
.game-container .game-message .score-sharing {
display: inline-block;
vertical-align: middle;
@@ -200,6 +202,8 @@ hr {
.game-container .game-message.game-won {
background: rgba(237, 194, 46, 0.5);
color: #f9f6f2; }
.game-container .game-message.game-won a.keep-playing-button {
display: inline-block; }
.game-container .game-message.game-won, .game-container .game-message.game-over {
display: block; }
@@ -372,6 +376,13 @@ hr {
@media screen and (max-width: 480px) {
.tile.tile-2048 .tile-inner {
font-size: 15px; } }
.tile.tile-super .tile-inner {
color: #f9f6f2;
background: #3c3a32;
font-size: 30px; }
@media screen and (max-width: 480px) {
.tile.tile-super .tile-inner {
font-size: 10px; } }
@-webkit-keyframes appear {
0% {
@@ -564,6 +575,8 @@ hr {
height: 40px;
line-height: 42px;
margin-left: 9px; }
.game-container .game-message a.keep-playing-button {
display: none; }
.game-container .game-message .score-sharing {
display: inline-block;
vertical-align: middle;
@@ -571,6 +584,8 @@ hr {
.game-container .game-message.game-won {
background: rgba(237, 194, 46, 0.5);
color: #f9f6f2; }
.game-container .game-message.game-won a.keep-playing-button {
display: inline-block; }
.game-container .game-message.game-won, .game-container .game-message.game-over {
display: block; }
style/main.scss
+20
View File
@@ -218,6 +218,10 @@ hr {
@include button;
margin-left: 9px;
// margin-top: 59px;
&.keep-playing-button {
display: none;
}
}
.score-sharing {
@@ -232,6 +236,10 @@ hr {
&.game-won {
background: rgba($tile-gold-color, .5);
color: $bright-text-color;
a.keep-playing-button {
display: inline-block;
}
}
&.game-won, &.game-over {
@@ -391,6 +399,18 @@ hr {
$exponent: $exponent + 1;
}
// Super tiles (above 2048)
&.tile-super .tile-inner {
color: $bright-text-color;
background: mix(#333, $tile-gold-color, 95%);
font-size: 30px;
@include smaller(480px) {
font-size: 10px;
}
}
}
@include keyframes(appear) {