Merge branch 'resume-game' of github.com:mfrederiksen/2048 into mfrederiksen-resume-game

This commit is contained in:
Gabriele Cirulli
2014-03-22 15:35:51 +01:00
8 changed files with 125 additions and 28 deletions
+14 -2
View File
@@ -143,8 +143,21 @@ hr {
100% {
opacity: 1; } }
.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;
width: 100px;
margin: 10px auto 10px auto;
text-align: center; }
.game-container {
margin-top: 40px;
position: relative;
padding: 15px;
cursor: default;
@@ -516,7 +529,6 @@ hr {
margin-bottom: 10px; }
.game-container {
margin-top: 40px;
position: relative;
padding: 10px;
cursor: default;
+8 -1
View File
@@ -168,10 +168,17 @@ hr {
line-height: 42px;
}
.restart-button {
@include button;
display: block;
width: 100px;
margin: 10px auto 10px auto;
text-align: center;
}
// Game field mixin used to render CSS at different width
@mixin game-field {
.game-container {
margin-top: 40px;
position: relative;
padding: $grid-spacing;